diff options
author | --author=Satoshi Nakamoto <satoshin@gmx.com> | 2010-07-30 17:36:06 +0000 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2010-07-30 17:36:06 +0000 |
commit | a75560d828464c3f1138f52cf247e956fc8f937d (patch) | |
tree | 2b2701c9c2a0a557bd8ad8b4874b2491f6cea0b0 /makefile.unix | |
parent | ec82517c8919f9cb7194511dc322a2575745e39e (diff) | |
download | bitcoin-a75560d828464c3f1138f52cf247e956fc8f937d.tar.xz |
reverted makefile.unix wx-config -- version 0.3.6v0.3.6
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 e2009dc5d1..e0489ed735 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 $@ $< |