Merge pull request #532 from TheBlueMatt/build-updates

Output build temp files in build/ instead of current directory.
This commit is contained in:
Gavin Andresen 2011-09-26 10:16:03 -07:00
commit 9a1ce86969
2 changed files with 4 additions and 3 deletions

3
.gitignore vendored
View File

@ -10,10 +10,7 @@ src/bitcoind
*.patch *.patch
.bitcoin .bitcoin
#compilation and Qt preprocessor part #compilation and Qt preprocessor part
*.o
ui_*.h
*.qm *.qm
moc_*
Makefile Makefile
bitcoin-qt bitcoin-qt
#resources cpp #resources cpp

View File

@ -5,6 +5,10 @@ DEFINES += QT_GUI
# DEFINES += SSL # DEFINES += SSL
CONFIG += no_include_pwd CONFIG += no_include_pwd
OBJECTS_DIR = build
MOC_DIR = build
UI_DIR = build
# for boost 1.37, add -mt to the boost libraries # for boost 1.37, add -mt to the boost libraries
LIBS += -lssl -lcrypto -ldb_cxx LIBS += -lssl -lcrypto -ldb_cxx
unix:!macx:LIBS += -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread unix:!macx:LIBS += -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread