Attachment #304439 for bug #407161

View | Details | Raw Unified | Return to bug 407161
Collapse All | Expand All




WXCONFIG = wx-config
CC = `$(WXCONFIG) --cc`
CPP = `$(WXCONFIG) --cxx`
WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -c ${OPTFLAGS}
WXLDFLAGS = `$(WXCONFIG) --libs` ${LDFLAGS}
RC = `$(WXCONFIG) --rescomp`
#RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;`

			src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
			src/HexEditorCtrl/HexEditorCtrlGui.cpp\
			src/HexEditorFrame.cpp
LIBS = -ludis86 -lmhash
OBJECTS=$(SOURCES:.cpp=.o)
DEPENDS=$(OBJECTS:.o=.d)
RESOURCES= resources/resource.rc

EXECUTABLE_WIN=$(EXECUTABLE).exe
EXECUTABLE_DIR_MAC=$(EXECUTABLE).app

DESTDIR     =
PREFIX      = $(DESTDIR)/usr
BINDIR      = $(PREFIX)/bin
DATADIR     = $(PREFIX)/share
LOCALEDIR   = $(DATADIR)/locale


all: $(EXECUTABLE)

$(OBJECTS): $(SOURCES)

$(EXECUTABLE): $(OBJECTS)
	$(CPP) $(OBJECTS) $(LIBS) $(WXLDFLAGS) $(LDFLAGS) -lgomp -o $@

.cpp.o:
	$(CPP) $(WXCXXFLAGS) $(CXXFLAGS) $< -o $@

%.o : %.rc
	$(RC) $(RCFLAGS) $< -o $@

udis86/libudis86/.libs/libudis86.a:
	cd udis86;./autogen.sh
	cd udis86;./configure --host=$(HOST)
	cd udis86/libudis86; $(MAKE) $(MFLAGS)

mhash/lib/.libs/libmhash.a:
	cd mhash; ./configure --host=$(HOST)
	cd mhash; $(MAKE) $(MFLAGS)

win: $(RESOURCES) $(EXECUTABLE_WIN)

#Stack override required for file comparison function...
$(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ)
	$(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(WXLDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,32000000 $(LDFLAGS) -o $@

maclink: $(OBJECTS)
	$(CPP) $(OBJECTS) $(LIBS) $(WXLDFLAGS) -lexpat -Wl,-stack_size,0x2000000 $(LDFLAGS) -o $(EXECUTABLE)

mac: maclink
	mkdir -p $(EXECUTABLE_DIR_MAC)/Contents

Lines 24-30 Link Here

(-)wxHexEditor.old//src/HexDialogs.cpp (-1 / +1 lines)
24	#define NANINT 0xFFFFFFFFFFFFFFFFLL	24	#define NANINT 0xFFFFFFFFFFFFFFFFLL
25	#include "HexDialogs.h"	25	#include "HexDialogs.h"
26	#include <wx/progdlg.h>	26	#include <wx/progdlg.h>
27	#include "../mhash/include/mhash.h"	27	#include <mhash.h>
28		28
29	#ifdef _OPENMP	29	#ifdef _OPENMP
30	#include <omp.h>	30	#include <omp.h>

Lines 25-31 Link Here

(-)wxHexEditor.old//src/HexEditor.h (-1 / +1 lines)
25	#ifndef _wxHexEditor_h_	25	#ifndef _wxHexEditor_h_
26	#define _wxHexEditor_h_	26	#define _wxHexEditor_h_
27		27
28	#include "../mhash/include/mhash.h"	28	#include <mhash.h>
29		29
30	#include <wx/ffile.h>	30	#include <wx/ffile.h>
31	#include <wx/clipbrd.h>	31	#include <wx/clipbrd.h>

Lines 27-33 Link Here

(-)wxHexEditor.old//src/HexPanels.h (-1 / +1 lines)
27	#include "HexEditorFrame.h"	27	#include "HexEditorFrame.h"
28	#include "HexEditorCtrl/HexEditorCtrl.h"	28	#include "HexEditorCtrl/HexEditorCtrl.h"
29	#include "HexEditorCtrl/wxHexCtrl/wxHexCtrl.h"	29	#include "HexEditorCtrl/wxHexCtrl/wxHexCtrl.h"
30	#include "../udis86/udis86.h"	30	#include <udis86.h>
31		31
32	#ifdef WX_GCH	32	#ifdef WX_GCH
33	#include <wx_pch.h>	33	#include <wx_pch.h>

Return to bug 407161

Lines 1-8 Link Here

(-)wxHexEditor.old//makefile (-19 / +11 lines)
1	WXCONFIG = wx-config	1	WXCONFIG = wx-config
2	CC = `$(WXCONFIG) --cc`	2	CC = `$(WXCONFIG) --cc`
3	CPP = `$(WXCONFIG) --cxx`	3	CPP = `$(WXCONFIG) --cxx`
4	CXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS}	4	WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -c ${OPTFLAGS}
5	LDFLAGS = `$(WXCONFIG) --libs`	5	WXLDFLAGS = `$(WXCONFIG) --libs` ${LDFLAGS}
6	RC = `$(WXCONFIG) --rescomp`	6	RC = `$(WXCONFIG) --rescomp`
7	#RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64	7	#RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
8	RCFLAGS = `$(WXCONFIG) --cxxflags \| sed s/' '-m.*//g;`	8	RCFLAGS = `$(WXCONFIG) --cxxflags \| sed s/' '-m.*//g;`
Lines 19-25 Link Here
19	src/HexEditorCtrl/wxHexCtrl/Tag.cpp\	19	src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
20	src/HexEditorCtrl/HexEditorCtrlGui.cpp\	20	src/HexEditorCtrl/HexEditorCtrlGui.cpp\
21	src/HexEditorFrame.cpp	21	src/HexEditorFrame.cpp
22	LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a	22	LIBS = -ludis86 -lmhash
23	OBJECTS=$(SOURCES:.cpp=.o)	23	OBJECTS=$(SOURCES:.cpp=.o)
24	DEPENDS=$(OBJECTS:.o=.d)	24	DEPENDS=$(OBJECTS:.o=.d)
25	RESOURCES= resources/resource.rc	25	RESOURCES= resources/resource.rc
Lines 28-34 Link Here
28	EXECUTABLE_WIN=$(EXECUTABLE).exe	28	EXECUTABLE_WIN=$(EXECUTABLE).exe
29	EXECUTABLE_DIR_MAC=$(EXECUTABLE).app	29	EXECUTABLE_DIR_MAC=$(EXECUTABLE).app
30		30
31	PREFIX = /usr/local	31	DESTDIR =
		32	PREFIX = $(DESTDIR)/usr
32	BINDIR = $(PREFIX)/bin	33	BINDIR = $(PREFIX)/bin
33	DATADIR = $(PREFIX)/share	34	DATADIR = $(PREFIX)/share
34	LOCALEDIR = $(DATADIR)/locale	35	LOCALEDIR = $(DATADIR)/locale
Lines 37-70 Link Here
37		38
38	all: $(EXECUTABLE)	39	all: $(EXECUTABLE)
39		40
40	$(OBJECTS): $(LIBS) $(SOURCES)	41	$(OBJECTS): $(SOURCES)
41		42
42	$(EXECUTABLE): $(OBJECTS)	43	$(EXECUTABLE): $(OBJECTS)
43	$(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -lgomp -o $@	44	$(CPP) $(OBJECTS) $(LIBS) $(WXLDFLAGS) $(LDFLAGS) -lgomp -o $@
44		45
45	.cpp.o: $(LIBS)	46	.cpp.o:
46	$(CPP) $(CXXFLAGS) $< -o $@	47	$(CPP) $(WXCXXFLAGS) $(CXXFLAGS) $< -o $@
47		48
48	%.o : %.rc	49	%.o : %.rc
49	$(RC) $(RCFLAGS) $< -o $@	50	$(RC) $(RCFLAGS) $< -o $@
50		51
51	udis86/libudis86/.libs/libudis86.a:
52	cd udis86;./autogen.sh
53	cd udis86;./configure --host=$(HOST)
54	cd udis86/libudis86; $(MAKE) $(MFLAGS)
55
56	mhash/lib/.libs/libmhash.a:
57	cd mhash; ./configure --host=$(HOST)
58	cd mhash; $(MAKE) $(MFLAGS)
59
60	win: $(RESOURCES) $(EXECUTABLE_WIN)	52	win: $(RESOURCES) $(EXECUTABLE_WIN)
61		53
62	#Stack override required for file comparison function...	54	#Stack override required for file comparison function...
63	$(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ)	55	$(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ)
64	$(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(LDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@	56	$(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(WXLDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,32000000 $(LDFLAGS) -o $@
65		57
66	maclink: $(OBJECTS)	58	maclink: $(OBJECTS)
67	$(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -lexpat -Wl,-stack_size,0x2000000 -o $(EXECUTABLE)	59	$(CPP) $(OBJECTS) $(LIBS) $(WXLDFLAGS) -lexpat -Wl,-stack_size,0x2000000 $(LDFLAGS) -o $(EXECUTABLE)
68		60
69	mac: maclink	61	mac: maclink
70	mkdir -p $(EXECUTABLE_DIR_MAC)/Contents	62	mkdir -p $(EXECUTABLE_DIR_MAC)/Contents