diff options
| author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-07-29 20:27:12 +0000 |
|---|---|---|
| committer | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-07-29 20:27:12 +0000 |
| commit | 757f0769d8360ea043f469f3a35f6ec204740446 (patch) | |
| tree | 28a5c8cd9936e3d6ae559efa87e5f1d571276540 /makefile.unix | |
| parent | 17b2740289268c037c5adb5956989f134982bf80 (diff) | |
reverted makefile.unix wx-config -- version 0.3.6
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@119 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'makefile.unix')
| -rw-r--r-- | makefile.unix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/makefile.unix b/makefile.unix index e393ff920d..597a0eaba0 100644 --- a/makefile.unix +++ b/makefile.unix @@ -3,12 +3,21 @@ # file license.txt or http://www.opensource.org/licenses/mit-license.php.
-WXLIBS=$(shell wx-config --debug=yes --libs --static)
-WXFLAGS=$(shell wx-config --debug=yes --cppflags)
+INCLUDEPATHS= \
+ -I"/usr/include" \
+ -I"/usr/local/include/wx-2.9" \
+ -I"/usr/local/lib/wx/include/gtk2-unicode-debug-static-2.9"
LIBPATHS= \
+ -L"/usr/lib" \
-L"/usr/local/lib"
+WXLIBS= \
+ -Wl,-Bstatic \
+ -l wx_gtk2ud-2.9 \
+ -Wl,-Bdynamic \
+ -l gtk-x11-2.0 -l SM
+
LIBS= \
-Wl,-Bstatic \
-l boost_system \
@@ -22,7 +31,7 @@ LIBS= \ DEFS=-D__WXGTK__ -DNOPCH
DEBUGFLAGS=-g -D__WXDEBUG__
-CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS)
+CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h
@@ -43,10 +52,10 @@ all: bitcoin headers.h.gch: headers.h $(HEADERS)
- g++ -c $(CFLAGS) $(WXFLAGS) -DGUI -o $@ $<
+ g++ -c $(CFLAGS) -DGUI -o $@ $<
obj/%.o: %.cpp $(HEADERS) headers.h.gch
- g++ -c $(CFLAGS) $(WXFLAGS) -DGUI -o $@ $<
+ g++ -c $(CFLAGS) -DGUI -o $@ $<
cryptopp/obj/%.o: cryptopp/%.cpp
g++ -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_SSE2 -o $@ $<
|