diff options
| author | --author=Satoshi Nakamoto <satoshin@gmx.com> | 2010-07-30 17:35:17 +0000 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2010-07-30 17:35:17 +0000 |
| commit | ec82517c8919f9cb7194511dc322a2575745e39e (patch) | |
| tree | 102c6ae76c23e2e222848e3ba8ae14e524358d39 /makefile.unix | |
| parent | 31ffe954b6f415b724c3214de5bffd7bba5872c0 (diff) | |
| download | bitcoin-ec82517c8919f9cb7194511dc322a2575745e39e.tar.xz | |
Fredrik Roubert: simplified makefile.unix with wx-config, misc
Diffstat (limited to 'makefile.unix')
| -rw-r--r-- | makefile.unix | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/makefile.unix b/makefile.unix index 4c8ded5c81..e2009dc5d1 100644 --- a/makefile.unix +++ b/makefile.unix @@ -3,21 +3,12 @@ # file license.txt or http://www.opensource.org/licenses/mit-license.php. -INCLUDEPATHS= \ - -I"/usr/include" \ - -I"/usr/local/include/wx-2.9" \ - -I"/usr/local/lib/wx/include/gtk2-unicode-debug-static-2.9" +WXLIBS=$(shell wx-config --debug=yes --libs --static) +WXFLAGS=$(shell wx-config --debug=yes --cppflags) 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 \ @@ -31,7 +22,7 @@ LIBS= \ DEFS=-D__WXGTK__ -DNOPCH DEBUGFLAGS=-g -D__WXDEBUG__ -CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) +CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) 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 @@ -52,13 +43,13 @@ all: bitcoin headers.h.gch: headers.h $(HEADERS) - g++ -c $(CFLAGS) -DGUI -o $@ $< + g++ -c $(CFLAGS) $(WXFLAGS) -DGUI -o $@ $< obj/%.o: %.cpp $(HEADERS) headers.h.gch - g++ -c $(CFLAGS) -DGUI -o $@ $< + g++ -c $(CFLAGS) $(WXFLAGS) -DGUI -o $@ $< cryptopp/obj/%.o: cryptopp/%.cpp - g++ -c $(CFLAGS) -O3 -o $@ $< + g++ -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_SSE2 -o $@ $< bitcoin: $(OBJS) obj/ui.o obj/uibase.o g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS) |