File wxhexeditor-0.23-mhash.patch of Package wxhexeditor

Overview Repositories Revisions Requests Users Attributes Meta

File wxhexeditor-0.23-mhash.patch of Package wxhexeditor (Revision db67e53c0a9f19a9ed9a84205a454a28)

Currently displaying revision db67e53c0a9f19a9ed9a84205a454a28 , Show latest

Index: Makefile
===================================================================
--- Makefile.orig	2017-03-16 05:50:42.000000000 +0200
+++ Makefile	2017-03-24 12:00:06.274960651 +0200
@@ -1,8 +1,9 @@
 WXCONFIG ?= wx-config
 HOST=
 LDFLAGS += -lgomp
+LDFLAGS += -lmhash
 #add this ldflags for WinConsole  "-Wl,--subsystem,console -mconsole" for win-debug
-WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -fopenmp -Wall
+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -fopenmp -Wall
 WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs core`
 RC = `$(WXCONFIG) --rescomp`
 #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
@@ -20,7 +21,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=`ls -l ./locale | grep ^d | sed s/.*\ //g;`
@@ -71,9 +72,9 @@ udis86/libudis86/.libs/libudis86.a:
 	cd udis86;./configure --host=$(HOST) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}" CPPFLAGS="$(CPPFLAGS)"
 	cd udis86/libudis86; $(MAKE) $(MFLAGS)
 
-mhash/lib/.libs/libmhash.a:
-	cd mhash; ./configure --host=$(HOST) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}" CPPFLAGS="$(CPPFLAGS)"
-	cd mhash; $(MAKE) $(MFLAGS)
+##mhash/lib/.libs/libmhash.a:
+##	cd mhash; ./configure --host=$(HOST) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}" CPPFLAGS="$(CPPFLAGS)"
+##	cd mhash; $(MAKE) $(MFLAGS)
 
 src/windrv.o:
 	$(CXX) $(LIBS) ${CXXFLAGS} ${OPTFLAGS} $(WXCXXFLAGS) $(WXLDFLAGS) ${LDFLAGS} -c src/windrv.cpp -o src/windrv.o
@@ -191,7 +192,6 @@ clean:
 	rm -f locale/*/wxHexEditor.mo
 distclean: clean
 	cd udis86;$(MAKE) distclean
-	cd mhash;$(MAKE) distclean
 
 # include the auto-generated dependency files
 -include $(DEPENDS)

Places

File wxhexeditor-0.23-mhash.patch of Package wxhexeditor (Revision db67e53c0a9f19a9ed9a84205a454a28)

Places