Merge pull request #532 from TheBlueMatt/build-updates

Output build temp files in build/ instead of current directory.
13 years ago · 9a1ce86969
parent adea540e38 36eccc5174
commit 9a1ce86969
2 changed files with 4 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,10 +10,7 @@ src/bitcoind
 *.patch
 .bitcoin
 #compilation and Qt preprocessor part
-*.o
-ui_*.h
 *.qm
-moc_*
 Makefile
 bitcoin-qt
 #resources cpp
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@ -5,6 +5,10 @@ DEFINES += QT_GUI
 # DEFINES += SSL
 CONFIG += no_include_pwd

+OBJECTS_DIR = build
+MOC_DIR = build
+UI_DIR = build
+
 # for boost 1.37, add -mt to the boost libraries
 LIBS += -lssl -lcrypto -ldb_cxx
 unix:!macx:LIBS += -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread