|
Line
Link Here
|
| 0 |
use system udis86 |
0 |
++ b/hashlibpp/src/Makefile |
| 1 |
respect flags |
|
|
| 2 |
parallel build error |
| 3 |
-- a/hashlibpp/src/Makefile |
|
Lines 50-56
INCLUDE_PATH = /usr/include/hashlib++
Link Here
|
| 50 |
LIB_PATH = /usr/local/lib/ |
50 |
LIB_PATH = /usr/local/lib/ |
| 51 |
|
51 |
|
| 52 |
# Compiler to use |
52 |
# Compiler to use |
| 53 |
COMPILER = g++ |
53 |
COMPILER = ${CXX} |
| 54 |
|
54 |
|
| 55 |
# Global options for the compiler |
55 |
# Global options for the compiler |
| 56 |
COPTIONS = -ansi -Wall -Wextra |
56 |
COPTIONS = -ansi -Wall -Wextra |
|
Lines 62-68
COPTIONS = -ansi -Wall -Wextra
Link Here
|
| 62 |
ifdef DEBUG |
62 |
ifdef DEBUG |
| 63 |
COPTIONS += -g |
63 |
COPTIONS += -g |
| 64 |
else |
64 |
else |
| 65 |
COPTIONS += -O3 -fomit-frame-pointer |
65 |
COPTIONS += ${CXXFLAGS} |
| 66 |
endif |
66 |
endif |
| 67 |
|
67 |
|
| 68 |
GCC = $(COMPILER) $(COPTIONS) |
68 |
GCC = $(COMPILER) $(COPTIONS) |
|
Lines 149-155
hl_sha512wrapper.o: hl_sha512wrapper.cpp hl_sha512wrapper.h
Link Here
|
| 149 |
#----------------------------------------------------------------------- |
149 |
#----------------------------------------------------------------------- |
| 150 |
# Creating a static lib using ar |
150 |
# Creating a static lib using ar |
| 151 |
|
151 |
|
| 152 |
LIB: MD5 SHA1 SHA256 |
152 |
LIB: MD5 SHA1 SHA256 SHA2EXT |
| 153 |
ar rs libhl++.a $(MD5) $(SHA1) $(SHA256) $(SHA2EXT) |
153 |
ar rs libhl++.a $(MD5) $(SHA1) $(SHA256) $(SHA2EXT) |
| 154 |
|
154 |
|
| 155 |
#----------------------------------------------------------------------- |
155 |
#----------------------------------------------------------------------- |
| 156 |
-- a/makefile |
156 |
++ b/makefile |
|
Lines 1-7
Link Here
|
| 1 |
WXCONFIG = wx-config |
1 |
WXCONFIG = wx-config |
| 2 |
CPP = `$(WXCONFIG) --cxx` |
2 |
CPP = `$(WXCONFIG) --cxx` |
| 3 |
CXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -c ${OPTFLAGS} |
3 |
WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -c ${OPTFLAGS} |
| 4 |
LDFLAGS = `$(WXCONFIG) --libs` |
4 |
WXLDFLAGS = `$(WXCONFIG) --libs` ${LDFLAGS} |
| 5 |
RC = `$(WXCONFIG) --rescomp` |
5 |
RC = `$(WXCONFIG) --rescomp` |
| 6 |
#RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64 |
6 |
#RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64 |
| 7 |
RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;` |
7 |
RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;` |
|
Lines 17-23
SOURCES= src/HexEditorGui.cpp \
Link Here
|
| 17 |
src/HexEditorCtrl/wxHexCtrl/Tag.cpp\ |
17 |
src/HexEditorCtrl/wxHexCtrl/Tag.cpp\ |
| 18 |
src/HexEditorCtrl/HexEditorCtrlGui.cpp\ |
18 |
src/HexEditorCtrl/HexEditorCtrlGui.cpp\ |
| 19 |
src/HexEditorFrame.cpp |
19 |
src/HexEditorFrame.cpp |
| 20 |
LIBS = udis86/libudis86/.libs/libudis86.a hashlibpp/src/libhl++.a |
20 |
LIBS = hashlibpp/src/libhl++.a |
| 21 |
OBJECTS=$(SOURCES:.cpp=.o) |
21 |
OBJECTS=$(SOURCES:.cpp=.o) |
| 22 |
DEPENDS=$(OBJECTS:.o=.d) |
22 |
DEPENDS=$(OBJECTS:.o=.d) |
| 23 |
RESOURCES= resources/resource.rc |
23 |
RESOURCES= resources/resource.rc |
|
Lines 39-57
all: prepare $(EXECUTABLE)
Link Here
|
| 39 |
prepare: $(LIBS) $(SOURCES) |
39 |
prepare: $(LIBS) $(SOURCES) |
| 40 |
|
40 |
|
| 41 |
$(EXECUTABLE): $(OBJECTS) $(LIBS) |
41 |
$(EXECUTABLE): $(OBJECTS) $(LIBS) |
| 42 |
$(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -o $@ |
42 |
$(CPP) $(OBJECTS) $(LIBS) -ludis86 $(WXLDFLAGS) ${LDFLAGS} -o $@ |
| 43 |
|
43 |
|
| 44 |
.cpp.o: |
44 |
.cpp.o: |
| 45 |
$(CPP) $(CXXFLAGS) $< -o $@ |
45 |
$(CPP) $(WXCXXFLAGS) ${CXXFLAGS} $< -o $@ |
| 46 |
|
46 |
|
| 47 |
%.o : %.rc |
47 |
%.o : %.rc |
| 48 |
$(RC) $(RCFLAGS) $< -o $@ |
48 |
$(RC) $(RCFLAGS) $< -o $@ |
| 49 |
|
49 |
|
| 50 |
udis86/libudis86/.libs/libudis86.a: |
50 |
#udis86/libudis86/.libs/libudis86.a: |
| 51 |
echo Please make sure if libudis86 build for your host to avoid link time errors! |
51 |
# echo Please make sure if libudis86 build for your host to avoid link time errors! |
| 52 |
cd udis86;./autogen.sh |
52 |
# cd udis86;./autogen.sh |
| 53 |
cd udis86;./configure |
53 |
# cd udis86;./configure |
| 54 |
cd udis86/libudis86; $(MAKE) $(MFLAGS) |
54 |
# cd udis86/libudis86; $(MAKE) $(MFLAGS) |
| 55 |
|
55 |
|
| 56 |
hashlibpp/src/libhl++.a: |
56 |
hashlibpp/src/libhl++.a: |
| 57 |
echo "Please make sure if libudis86 build for your host to avoid link time errors!" |
57 |
echo "Please make sure if libudis86 build for your host to avoid link time errors!" |
|
Lines 61-70
win: prepare $(RESOURCES) $(EXECUTABLE_WIN)
Link Here
|
| 61 |
|
61 |
|
| 62 |
#Stack override required for file comparison function... |
62 |
#Stack override required for file comparison function... |
| 63 |
$(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ) |
63 |
$(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ) |
| 64 |
$(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(LDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,5242880 -o $@ |
64 |
$(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(WXLDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,5242880 ${LDFLAGS} -o $@ |
| 65 |
|
65 |
|
| 66 |
maclink: $(OBJECTS) |
66 |
maclink: $(OBJECTS) |
| 67 |
$(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -lexpat -o $(EXECUTABLE) |
67 |
$(CPP) $(OBJECTS) $(LIBS) $(WXLDFLAGS) -lexpat ${LDFLAGS} -o $(EXECUTABLE) |
| 68 |
|
68 |
|
| 69 |
mac: prepare maclink |
69 |
mac: prepare maclink |
| 70 |
mkdir -p $(EXECUTABLE_DIR_MAC)/Contents |
70 |
mkdir -p $(EXECUTABLE_DIR_MAC)/Contents |
