File wxhexeditor-0.22-mhash.patch of Package wxhexeditor

Overview Repositories Revisions Requests Users Attributes Meta

File wxhexeditor-0.22-mhash.patch of Package wxhexeditor

Index: wxHexEditor/Makefile
===================================================================
--- wxHexEditor.orig/Makefile
+++ wxHexEditor/Makefile
@@ -3,7 +3,7 @@ CC = `$(WXCONFIG) --cc`
 CXX = `$(WXCONFIG) --cxx`
 CFLAGS = -O2
 CXXFLAGS = -O2
-WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS}
+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -O2 -c ${OPTFLAGS}
 WXLDFLAGS = `$(WXCONFIG) --libs`
 RC = `$(WXCONFIG) --rescomp`
 #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
@@ -23,7 +23,7 @@ SOURCES= src/HexEditorGui.cpp \
 			src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
 			src/HexEditorCtrl/HexEditorCtrlGui.cpp\
 			src/HexEditorFrame.cpp
-LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a
+LIBS = udis86/libudis86/.libs/libudis86.a
 OBJECTS=$(SOURCES:.cpp=.o)
 DEPENDS=$(OBJECTS:.o=.d)
 LANGUAGEDIRS=tr ru
@@ -48,7 +48,7 @@ $(OBJECTS): $(LIBS) $(SOURCES)
 MOBJECTS=$(LANGUAGES:.po=.mo)
 
 $(EXECUTABLE): $(OBJECTS)
-	$(CXX) $(OBJECTS) $(LIBS) ${CXXFLAGS} ${OPTFLAGS} $(WXLDFLAGS) ${LDFLAGS} -lgomp -o $@
+	$(CXX) $(OBJECTS) $(LIBS) ${CXXFLAGS} ${OPTFLAGS} $(WXLDFLAGS) ${LDFLAGS} -lgomp -lmhash -o $@
 
 .cpp.o: $(LIBS)
 	$(CXX) $(WXCXXFLAGS) ${CXXFLAGS} $< -o $@
@@ -66,10 +66,6 @@ udis86/libudis86/.libs/libudis86.a:
 	cd udis86;./configure --host=$(HOST) CC=$(CC) CXX=$(CXX) CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
 	cd udis86/libudis86; $(MAKE) $(MFLAGS)
 
-mhash/lib/.libs/libmhash.a:
-	cd mhash; ./configure --host=$(HOST) CC=$(CC) CXX=$(CXX) CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-	cd mhash; $(MAKE) $(MFLAGS)
-
 win: $(RESOURCES) $(EXECUTABLE_WIN)
 
 #Stack override required for file comparison function...

Places

File wxhexeditor-0.22-mhash.patch of Package wxhexeditor

Places