LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #2097 from Diapolo/fix_merges

Browse source 
fix small stuff related to the recent merge-wave
This commit is contained in:
Gavin Andresen 2012-12-12 10:42:26 -08:00
commit 5fe3f4652e
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bitcoin-qt.pro
View file

@ -197,7 +197,8 @@ HEADERS += src/qt/bitcoingui.h \
src/netbase.h \ src/netbase.h \
src/clientversion.h \ src/clientversion.h \
src/txdb.h \ src/txdb.h \
src/leveldb.h src/leveldb.h \
src/threadsafety.h
SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/transactiontablemodel.cpp \ src/qt/transactiontablemodel.cpp \

6
src/leveldb/build_detect_platform
View file

@ -119,15 +119,15 @@ case "$TARGET_OS" in
PLATFORM_EXTRALIBS="-lboost_system-mt-s -lboost_filesystem-mt-s -lboost_thread_win32-mt-s" PLATFORM_EXTRALIBS="-lboost_system-mt-s -lboost_filesystem-mt-s -lboost_thread_win32-mt-s"
CROSS_COMPILE=true CROSS_COMPILE=true
;; ;;
NATIVE_WINDOWS) NATIVE_WINDOWS)
PLATFORM=OS_WINDOWS PLATFORM=OS_WINDOWS
COMMON_FLAGS="-fno-builtin-memcmp -D_REENTRANT -DOS_WINDOWS -DLEVELDB_PLATFORM_WINDOWS -DBOOST_THREAD_USE_LIB" COMMON_FLAGS="-fno-builtin-memcmp -D_REENTRANT -DOS_WINDOWS -DLEVELDB_PLATFORM_WINDOWS -DBOOST_THREAD_USE_LIB"
PLATFORM_CXXFLAGS="" PLATFORM_CXXFLAGS=""
PLATFORM_LDFLAGS="" PLATFORM_LDFLAGS=""
PLATFORM_SHARED_CFLAGS="" PLATFORM_SHARED_CFLAGS=""
PLATFORM_SOURCES="port/port_win.cc util/env_boost.cc util/win_logger.cc" 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" 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 CROSS_COMPILE=true
;; ;;
*) *)
echo "Unknown platform!" >&2 echo "Unknown platform!" >&2