diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-26 10:04:04 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-26 10:04:04 -0400 |
| commit | 565c4771b6eba0eeb82f8602735100bbcf4b053e (patch) | |
| tree | e734f79e82ca1e4c442412907435b77fa640a11d /src/makefile.unix | |
| parent | ee1d6e4ed0a931defc6f6273cc67a0a3e980940f (diff) | |
| download | bitcoin-565c4771b6eba0eeb82f8602735100bbcf4b053e.tar.xz | |
Remove wxWidgets
Makefiles now build bitcoind only.
qmake/make in top-level directory is used to build Bitcoin QT
Deleted almost all #ifdef GUI from the code (left one possibly controversial one)
Deleted xpm/ files.
Diffstat (limited to 'src/makefile.unix')
| -rw-r--r-- | src/makefile.unix | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/makefile.unix b/src/makefile.unix index b893853fd0..88ca8895f1 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -4,10 +4,6 @@ CXX=g++ -WXINCLUDEPATHS=$(shell wx-config --cxxflags) - -WXLIBS=$(shell wx-config --libs) - USE_UPNP:=0 DEFS=-DNOPCH -DUSE_SSL @@ -64,7 +60,7 @@ LIBS+= \ # -DEBUGFLAGS=-g -D__WXDEBUG__ +DEBUGFLAGS=-g CXXFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(HARDENING) HEADERS = \ base58.h \ @@ -84,8 +80,6 @@ HEADERS = \ script.h \ serialize.h \ strlcpy.h \ - ui.h \ - uibase.h \ uint256.h \ util.h \ wallet.h @@ -107,17 +101,7 @@ OBJS= \ cryptopp/obj/cpu.o -all: bitcoin - - -obj/%.o: %.cpp $(HEADERS) - $(CXX) -c $(CXXFLAGS) $(WXINCLUDEPATHS) -DGUI -o $@ $< - -cryptopp/obj/%.o: cryptopp/%.cpp - $(CXX) -c $(CXXFLAGS) -O3 -o $@ $< - -bitcoin: $(OBJS) obj/ui.o obj/uibase.o - $(CXX) $(CXXFLAGS) -o $@ $^ $(WXLIBS) $(LIBS) +all: bitcoind obj/nogui/%.o: %.cpp $(HEADERS) @@ -133,7 +117,7 @@ test_bitcoin: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/% $(CXX) $(CXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-Bstatic -lboost_unit_test_framework $(LIBS) clean: - -rm -f bitcoin bitcoind test_bitcoin + -rm -f bitcoind test_bitcoin -rm -f obj/*.o -rm -f obj/nogui/*.o -rm -f obj/test/*.o |