Skip to content

Commit

Permalink
Fixes issue kR105-zz#3
Browse files Browse the repository at this point in the history
  • Loading branch information
kr105 committed Dec 29, 2013
1 parent 0cbf20a commit 141ac40
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions bitcoin-qt.pro
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd
CONFIG += thread
!macx:CONFIG += static

# for boost 1.37, add -mt to the boost libraries
# use: qmake BOOST_LIB_SUFFIX=-mt
Expand Down Expand Up @@ -67,8 +66,6 @@ win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
win32:QMAKE_LFLAGS *= -Wl,--large-address-aware
# i686-w64-mingw32
win32:QMAKE_LFLAGS *= -static-libgcc -static-libstdc++
# static linking
!macx:QMAKE_LFLAGS *= -static

# use: qmake "USE_QRCODE=1"
# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
Expand Down Expand Up @@ -343,12 +340,18 @@ DEFINES += BITCOIN_QT_TEST
}

contains(USE_SSE2, 1) {
DEFINES += USE_SSE2
gccsse2.input = SOURCES_SSE2
gccsse2.output = $$PWD/build/${QMAKE_FILE_BASE}.o
gccsse2.commands = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME} -msse2 -mstackrealign
QMAKE_EXTRA_COMPILERS += gccsse2
SOURCES_SSE2 += src/scrypt-sse2.cpp
DEFINES += USE_SSE2
gccsse2.input = SOURCES_SSE2
gccsse2.output = $$PWD/build/${QMAKE_FILE_BASE}.o
gccsse2.commands = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME} -msse2 -mstackrealign
QMAKE_EXTRA_COMPILERS += gccsse2
SOURCES_SSE2 += src/scrypt-sse2.cpp
}

# use: qmake "STATICBUILD=1"
contains(STATICBUILD, 1) {
!macx:CONFIG += static
!macx:QMAKE_LFLAGS *= -static
}

# Todo: Remove this line when switching to Qt5, as that option was removed
Expand Down

0 comments on commit 141ac40

Please sign in to comment.