Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

fix small stuff related to the recent merge-wave #2097

Merged
merged 2 commits into from

2 participants

@Diapolo

No description provided.

Philip Kaufmann added some commits
Philip Kaufmann 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
a4b4364
Philip Kaufmann LevelDB: build_detect_platform fix NATIVE_WINDOWS indentation
- fix some indentation issues
50ce573
@gavinandresen gavinandresen merged commit 5fe3f46 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 12, 2012
  1. add threadsafety.h to bitcoin-qt.pro

    Philip Kaufmann authored
    - to be able to see threadsafety.h in the Qt Creator IDE the file needs to
      be added to the HEADERS section
  2. LevelDB: build_detect_platform fix NATIVE_WINDOWS indentation

    Philip Kaufmann authored
    - fix some indentation issues
This page is out of date. Refresh to see the latest.
Showing with 5 additions and 4 deletions.
  1. +2 −1  bitcoin-qt.pro
  2. +3 −3 src/leveldb/build_detect_platform
View
3  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 \
View
6 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
Something went wrong with that request. Please try again.