diff --git a/src/makefile.unix b/src/makefile.unix index f17de05c..4dfb8074 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -147,7 +147,7 @@ OBJS= \ obj/chainparams.o -all: bitcoind +all: twisterd test check: test_bitcoin FORCE ./test_bitcoin @@ -178,7 +178,7 @@ obj/%.o: %.cpp -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ rm -f $(@:%.o=%.d) -bitcoind: $(OBJS:obj/%=obj/%) +twisterd: $(OBJS:obj/%=obj/%) $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) @@ -194,7 +194,7 @@ test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o obj/bitcoind.o,$(OBJS:obj/%=ob $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS) clean: - -rm -f bitcoind test_bitcoin + -rm -f twisterd test_bitcoin -rm -f obj/*.o -rm -f obj-test/*.o -rm -f obj/*.P diff --git a/twister-qt.pro b/twister-qt.pro index 15db6479..894901b8 100644 --- a/twister-qt.pro +++ b/twister-qt.pro @@ -1,6 +1,6 @@ TEMPLATE = app -TARGET = twister-qt -macx:TARGET = "Twister-Qt" +TARGET = twisterd +macx:TARGET = "Twisterd" VERSION = 0.8.2 INCLUDEPATH += src src/json src/qt QT += core gui network @@ -290,7 +290,7 @@ SOURCES += \ #src/qt/bitcoin.cpp \ # src/qt/rpcconsole.cpp \ # src/qt/splashscreen.cpp -RESOURCES += src/qt/bitcoin.qrc +#RESOURCES += src/qt/bitcoin.qrc #FORMS += src/qt/forms/sendcoinsdialog.ui \ # src/qt/forms/addressbookpage.ui \