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.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user