diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-26 10:16:03 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-26 10:16:03 -0700 |
| commit | 9a1ce869690fe87fbce169a4b685695dc9e575f6 (patch) | |
| tree | 29784c08861f8a339c2aefce2aca6d16ee3e162e | |
| parent | adea540e38d1039f26faa28f9eda3364e57b202e (diff) | |
| parent | 36eccc5174fab77783a242b5da68c3045c65d811 (diff) | |
Merge pull request #532 from TheBlueMatt/build-updates
Output build temp files in build/ instead of current directory.
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | bitcoin-qt.pro | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index a5f96ba44c..66f93867d8 100644 --- 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 diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 19d7814d39..b9fecb848e 100644 --- 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 |