Skip to content

Commit

Permalink
Code fixes to original dev work
Browse files Browse the repository at this point in the history
  • Loading branch information
glyphcoin committed Jun 17, 2014
1 parent 77cb927 commit 96c59b5
Showing 1 changed file with 16 additions and 15 deletions.
31 changes: 16 additions & 15 deletions glyphcoin-qt.pro
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,21 @@ greaterThan(QT_MAJOR_VERSION, 4) {
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
}

BOOST_LIB_SUFFIX=
#-mgw48-mt-s-1_55
BOOST_INCLUDE_PATH=C:/deps/boost_1_55_0
BOOST_LIB_PATH=C:/deps/boost_1_55_0/stage/lib
BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix
BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix
OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1g/include
OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1g
MINIUPNPC_INCLUDE_PATH=C:/deps
LIBPNG_INCLUDE_PATH=C:/deps/libpng-1.6.9
LIBPNG_LIB_PATH=C:/deps/libpng-1.6.9/.libs
MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.3
QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.3/.libs

# Windows specific compilation parameters. Thanks to Marada for the tip.
windows:BOOST_LIB_SUFFIX=-mgw48-mt-s-1_55
windows:BOOST_INCLUDE_PATH=C:/deps/boost_1_55_0
windows:BOOST_LIB_PATH=C:/deps/boost_1_55_0/stage/lib
windows:BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix
windows:BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix
windows:OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1g/include
windows:OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1g
windows:MINIUPNPC_INCLUDE_PATH=C:/deps
windows:LIBPNG_INCLUDE_PATH=C:/deps/libpng-1.6.9
windows:LIBPNG_LIB_PATH=C:/deps/libpng-1.6.9/.libs
windows:MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
windows:QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.3
windows:QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.3/.libs

# for boost 1.37, add -mt to the boost libraries
# use: qmake BOOST_LIB_SUFFIX=-mt
Expand Down Expand Up @@ -418,7 +419,7 @@ OTHER_FILES += \
# platform specific defaults, if not overridden on command line
# isEmpty(BOOST_LIB_SUFFIX) {
# macx:BOOST_LIB_SUFFIX = -mt
# windows:BOOST_LIB_SUFFIX = -mgw48-mt-s-1_550
# BOOST_LIB_SUFFIX = -mgw48-mt-s-1_550
# }

isEmpty(BOOST_THREAD_LIB_SUFFIX) {
Expand Down

0 comments on commit 96c59b5

Please sign in to comment.