| 1 |
dirtyepic 12/07/02 03:47:53 |
| 2 |
|
| 3 |
Added: wxhexeditor-0.20-makefile.patch |
| 4 |
Removed: wxhexeditor-0.09-gcc45.patch |
| 5 |
Log: |
| 6 |
Version bump, bug #407161. Remove old. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-editors/wxhexeditor/files/wxhexeditor-0.20-makefile.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/wxhexeditor/files/wxhexeditor-0.20-makefile.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/wxhexeditor/files/wxhexeditor-0.20-makefile.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: wxhexeditor-0.20-makefile.patch |
| 17 |
=================================================================== |
| 18 |
--- a/makefile |
| 19 |
+++ b/makefile |
| 20 |
@@ -1,8 +1,8 @@ |
| 21 |
WXCONFIG = wx-config |
| 22 |
CC = `$(WXCONFIG) --cc` |
| 23 |
CPP = `$(WXCONFIG) --cxx` |
| 24 |
-CXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS} |
| 25 |
-LDFLAGS = `$(WXCONFIG) --libs` |
| 26 |
+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -c ${OPTFLAGS} -fopenmp ${CXXFLAGS} |
| 27 |
+WXLDFLAGS = `$(WXCONFIG) --libs` -fopenmp ${LDFLAGS} |
| 28 |
RC = `$(WXCONFIG) --rescomp` |
| 29 |
#RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64 |
| 30 |
RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;` |
| 31 |
@@ -19,7 +19,7 @@ SOURCES= src/HexEditorGui.cpp \ |
| 32 |
src/HexEditorCtrl/wxHexCtrl/Tag.cpp\ |
| 33 |
src/HexEditorCtrl/HexEditorCtrlGui.cpp\ |
| 34 |
src/HexEditorFrame.cpp |
| 35 |
-LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a |
| 36 |
+LIBS = -lmhash -ludis86 |
| 37 |
OBJECTS=$(SOURCES:.cpp=.o) |
| 38 |
DEPENDS=$(OBJECTS:.o=.d) |
| 39 |
RESOURCES= resources/resource.rc |
| 40 |
@@ -28,43 +28,35 @@ EXECUTABLE=wxHexEditor |
| 41 |
EXECUTABLE_WIN=$(EXECUTABLE).exe |
| 42 |
EXECUTABLE_DIR_MAC=$(EXECUTABLE).app |
| 43 |
|
| 44 |
-PREFIX = /usr/local |
| 45 |
+DESTDIR = |
| 46 |
+PREFIX = $(DESTDIR)/usr |
| 47 |
BINDIR = $(PREFIX)/bin |
| 48 |
DATADIR = $(PREFIX)/share |
| 49 |
LOCALEDIR = $(DATADIR)/locale |
| 50 |
|
| 51 |
-VERSION = 0.12 Beta |
| 52 |
+VERSION = 0.20 |
| 53 |
|
| 54 |
all: $(EXECUTABLE) |
| 55 |
|
| 56 |
-$(OBJECTS): $(LIBS) $(SOURCES) |
| 57 |
+$(OBJECTS): $(SOURCES) |
| 58 |
|
| 59 |
$(EXECUTABLE): $(OBJECTS) |
| 60 |
- $(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -lgomp -o $@ |
| 61 |
+ $(CPP) $(OBJECTS) $(LIBS) $(WXLDFLAGS) ${CXXFLAGS} -o $@ |
| 62 |
|
| 63 |
-.cpp.o: $(LIBS) |
| 64 |
- $(CPP) $(CXXFLAGS) $< -o $@ |
| 65 |
+.cpp.o: |
| 66 |
+ $(CPP) $(WXCXXFLAGS) $< -o $@ |
| 67 |
|
| 68 |
%.o : %.rc |
| 69 |
$(RC) $(RCFLAGS) $< -o $@ |
| 70 |
|
| 71 |
-udis86/libudis86/.libs/libudis86.a: |
| 72 |
- cd udis86;./autogen.sh |
| 73 |
- cd udis86;./configure --host=$(HOST) |
| 74 |
- cd udis86/libudis86; $(MAKE) $(MFLAGS) |
| 75 |
- |
| 76 |
-mhash/lib/.libs/libmhash.a: |
| 77 |
- cd mhash; ./configure --host=$(HOST) |
| 78 |
- cd mhash; $(MAKE) $(MFLAGS) |
| 79 |
- |
| 80 |
win: $(RESOURCES) $(EXECUTABLE_WIN) |
| 81 |
|
| 82 |
#Stack override required for file comparison function... |
| 83 |
$(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ) |
| 84 |
- $(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(LDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@ |
| 85 |
+ $(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@ |
| 86 |
|
| 87 |
maclink: $(OBJECTS) |
| 88 |
- $(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -lexpat -Wl,-stack_size,0x2000000 -o $(EXECUTABLE) |
| 89 |
+ $(CPP) $(OBJECTS) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) -lexpat -Wl,-stack_size,0x2000000 -o $(EXECUTABLE) |
| 90 |
|
| 91 |
mac: maclink |
| 92 |
mkdir -p $(EXECUTABLE_DIR_MAC)/Contents |
| 93 |
--- a/src/HexDialogs.cpp |
| 94 |
+++ b/src/HexDialogs.cpp |
| 95 |
@@ -24,7 +24,7 @@ |
| 96 |
#define NANINT 0xFFFFFFFFFFFFFFFFLL |
| 97 |
#include "HexDialogs.h" |
| 98 |
#include <wx/progdlg.h> |
| 99 |
-#include "../mhash/include/mhash.h" |
| 100 |
+#include <mhash.h> |
| 101 |
|
| 102 |
#ifdef _OPENMP |
| 103 |
#include <omp.h> |
| 104 |
--- a/src/HexEditor.h |
| 105 |
+++ b/src/HexEditor.h |
| 106 |
@@ -25,7 +25,7 @@ |
| 107 |
#ifndef _wxHexEditor_h_ |
| 108 |
#define _wxHexEditor_h_ |
| 109 |
|
| 110 |
-#include "../mhash/include/mhash.h" |
| 111 |
+#include <mhash.h> |
| 112 |
|
| 113 |
#include <wx/ffile.h> |
| 114 |
#include <wx/clipbrd.h> |
| 115 |
--- a/src/HexPanels.h |
| 116 |
+++ b/src/HexPanels.h |
| 117 |
@@ -27,7 +27,7 @@ |
| 118 |
#include "HexEditorFrame.h" |
| 119 |
#include "HexEditorCtrl/HexEditorCtrl.h" |
| 120 |
#include "HexEditorCtrl/wxHexCtrl/wxHexCtrl.h" |
| 121 |
-#include "../udis86/udis86.h" |
| 122 |
+#include <udis86.h> |
| 123 |
|
| 124 |
#ifdef WX_GCH |
| 125 |
#include <wx_pch.h> |
Archives