diff options
| author | ojab <ojab@ojab.ru> | 2011-01-31 15:07:55 +0300 |
|---|---|---|
| committer | ojab <ojab@ojab.ru> | 2011-01-31 15:07:55 +0300 |
| commit | f0b7952caaf2500faa3cb6b0ddae8ff41f3cad96 (patch) | |
| tree | 284a78b392ff81465be0db9efb15b6abf6f0223a /makefile.unix | |
| parent | b1a657a00d0b4bbdb67f8b97f3bddde3ae9edba9 (diff) | |
| download | bitcoin-f0b7952caaf2500faa3cb6b0ddae8ff41f3cad96.tar.xz | |
1. Change hardcoded g++ to $(CXX)
2. Change CFLAGS to CXXFLAGS
3. Add binaries to clean target
4. Generate wxWidgets includes/ldflags/etc from wx-config
Diffstat (limited to 'makefile.unix')
| -rw-r--r-- | makefile.unix | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/makefile.unix b/makefile.unix index 9573a560f6..b36aa2c6a8 100644 --- a/makefile.unix +++ b/makefile.unix @@ -2,18 +2,11 @@ # Distributed under the MIT/X11 software license, see the accompanying # file license.txt or http://www.opensource.org/licenses/mit-license.php. +CXX=g++ -INCLUDEPATHS= \ - -I"/usr/local/include/wx-2.9" \ - -I"/usr/local/lib/wx/include/gtk2-unicode-debug-static-2.9" +WXINCLUDEPATHS:=$(shell wx-config --cppflags) -# for wxWidgets 2.9.1, add -l Xxf86vm -WXLIBS= \ - -Wl,-Bstatic \ - -l wx_gtk2ud-2.9 \ - -Wl,-Bdynamic \ - -l gtk-x11-2.0 \ - -l SM +WXLIBS:=$(shell wx-config --libs) # for boost 1.37, add -mt to the boost libraries LIBS= \ @@ -30,9 +23,9 @@ LIBS= \ -l z \ -l dl -DEFS=-D__WXGTK__ -DNOPCH -DFOURWAYSSE2 -DUSE_SSL +DEFS:=$(shell wx-config --cxxflags) -DNOPCH -DFOURWAYSSE2 -DUSE_SSL DEBUGFLAGS=-g -D__WXDEBUG__ -CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) +CXXFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(WXINCLUDEPATHS) 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 @@ -53,23 +46,23 @@ all: bitcoin obj/%.o: %.cpp $(HEADERS) - g++ -c $(CFLAGS) -DGUI -o $@ $< + $(CXX) -c $(CXXFLAGS) -DGUI -o $@ $< cryptopp/obj/%.o: cryptopp/%.cpp - g++ -c $(CFLAGS) -O3 -o $@ $< + $(CXX) -c $(CXXFLAGS) -O3 -o $@ $< obj/sha256.o: sha256.cpp - g++ -c $(CFLAGS) -msse2 -O3 -march=amdfam10 -o $@ $< + $(CXX) -c $(CXXFLAGS) -msse2 -O3 -march=amdfam10 -o $@ $< bitcoin: $(OBJS) obj/ui.o obj/uibase.o obj/sha256.o - g++ $(CFLAGS) -o $@ $^ $(WXLIBS) $(LIBS) + $(CXX) $(CXXFLAGS) -o $@ $^ $(WXLIBS) $(LIBS) obj/nogui/%.o: %.cpp $(HEADERS) - g++ -c $(CFLAGS) -o $@ $< + $(CXX) -c $(CXXFLAGS) -o $@ $< bitcoind: $(OBJS:obj/%=obj/nogui/%) obj/sha256.o - g++ $(CFLAGS) -o $@ $^ $(LIBS) + $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS) clean: @@ -77,3 +70,5 @@ clean: -rm -f obj/nogui/*.o -rm -f cryptopp/obj/*.o -rm -f headers.h.gch + -rm -f bitcoin + -rm -f bitcoind |