diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-12-12 10:42:26 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-12-12 10:42:26 -0800 |
| commit | 5fe3f4652ed20780b3e93ddbe3f5b67d646a704a (patch) | |
| tree | 53998df3da7a0341f469f1281b127825acf70ce8 | |
| parent | 51dc438942e5bb8fd8abf94a457d7e99f4417ee4 (diff) | |
| parent | 50ce5735d6a55d3993a027fdc2a145fe4c2c723a (diff) | |
| download | bitcoin-5fe3f4652ed20780b3e93ddbe3f5b67d646a704a.tar.xz | |
Merge pull request #2097 from Diapolo/fix_merges
fix small stuff related to the recent merge-wave
| -rw-r--r-- | bitcoin-qt.pro | 3 | ||||
| -rwxr-xr-x | src/leveldb/build_detect_platform | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 3b2de5af3b..b10cda2af6 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -197,7 +197,8 @@ HEADERS += src/qt/bitcoingui.h \ src/netbase.h \ src/clientversion.h \ src/txdb.h \ - src/leveldb.h + src/leveldb.h \ + src/threadsafety.h SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/transactiontablemodel.cpp \ diff --git a/src/leveldb/build_detect_platform b/src/leveldb/build_detect_platform index b16a3aae7c..566d1f83a4 100755 --- a/src/leveldb/build_detect_platform +++ b/src/leveldb/build_detect_platform @@ -119,15 +119,15 @@ case "$TARGET_OS" in PLATFORM_EXTRALIBS="-lboost_system-mt-s -lboost_filesystem-mt-s -lboost_thread_win32-mt-s" CROSS_COMPILE=true ;; - NATIVE_WINDOWS) + NATIVE_WINDOWS) PLATFORM=OS_WINDOWS COMMON_FLAGS="-fno-builtin-memcmp -D_REENTRANT -DOS_WINDOWS -DLEVELDB_PLATFORM_WINDOWS -DBOOST_THREAD_USE_LIB" PLATFORM_CXXFLAGS="" PLATFORM_LDFLAGS="" PLATFORM_SHARED_CFLAGS="" PLATFORM_SOURCES="port/port_win.cc util/env_boost.cc util/win_logger.cc" - PLATFORM_EXTRALIBS="-lboost_system-mgw45-mt-s-1_50 -lboost_filesystem-mgw45-mt-s-1_50 -lboost_thread-mgw45-mt-s-1_50 -lboost_chrono-mgw45-mt-s-1_50" - CROSS_COMPILE=true + PLATFORM_EXTRALIBS="-lboost_system-mgw45-mt-s-1_50 -lboost_filesystem-mgw45-mt-s-1_50 -lboost_thread-mgw45-mt-s-1_50 -lboost_chrono-mgw45-mt-s-1_50" + CROSS_COMPILE=true ;; *) echo "Unknown platform!" >&2 |