From a4b43645aa44de82bf76a04656030593480b5f70 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Wed, 12 Dec 2012 19:31:18 +0100 Subject: [PATCH 1/2] add threadsafety.h to bitcoin-qt.pro - to be able to see threadsafety.h in the Qt Creator IDE the file needs to be added to the HEADERS section --- bitcoin-qt.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 3b2de5af..b10cda2a 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 \ From 50ce5735d6a55d3993a027fdc2a145fe4c2c723a Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Wed, 12 Dec 2012 19:35:22 +0100 Subject: [PATCH 2/2] LevelDB: build_detect_platform fix NATIVE_WINDOWS indentation - fix some indentation issues --- src/leveldb/build_detect_platform | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/leveldb/build_detect_platform b/src/leveldb/build_detect_platform index b16a3aae..566d1f83 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