TEMPLATE = app
TARGET =
-VERSION = 0.5.0.6
+VERSION = 0.5.4
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB
CONFIG += no_include_pwd
TRANSLATIONS = $$files(src/qt/locale/bitcoin_*.ts)
isEmpty(QMAKE_LRELEASE) {
- win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
+ win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
}
isEmpty(TS_DIR):TS_DIR = src/qt/locale
macx:BOOST_INCLUDE_PATH = /opt/local/include
}
- windows:LIBS += -lmingwthrd -lws2_32
- windows:DEFINES += _MT WIN32
+ windows:LIBS += -lws2_32
+ windows:DEFINES += WIN32
windows:RC_FILE = src/qt/res/bitcoin-qt.rc
- windows:QMAKE_LIBS_QT_ENTRY -= -lmingw32
+
+ windows:!contains(MINGW_THREAD_BUGFIX, 0) {
+ # At least qmake's win32-g++-cross profile is missing the -lmingwthrd
+ # thread-safety flag. GCC has -mthreads to enable this, but it doesn't
+ # work with static linking. -lmingwthrd must come BEFORE -lmingw, so
+ # it is prepended to QMAKE_LIBS_QT_ENTRY.
+ # It can be turned off with MINGW_THREAD_BUGFIX=0, just in case it causes
+ # any problems on some untested qmake profile now or in the future.
+ DEFINES += _MT
+ QMAKE_LIBS_QT_ENTRY = -lmingwthrd $$QMAKE_LIBS_QT_ENTRY
+ }
macx:HEADERS += src/qt/macdockiconhandler.h
macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
\r
# General Symbol Definitions\r
!define REGKEY "SOFTWARE\$(^Name)"\r
-!define VERSION 0.5.0.6\r
+!define VERSION 0.5.4\r
!define COMPANY "Bitcoin project"\r
!define URL http://www.bitcoin.org/\r
\r
!insertmacro MUI_LANGUAGE English\r
\r
# Installer attributes\r
-OutFile bitcoin-0.5.0.6-win32-setup.exe\r
+OutFile bitcoin-0.5.4-win32-setup.exe\r
InstallDir $PROGRAMFILES\Bitcoin\r
CRCCheck on\r
XPStyle on\r
BrandingText " "\r
ShowInstDetails show\r
-VIProductVersion 0.5.0.6\r
+VIProductVersion 0.5.4.0\r
VIAddVersionKey ProductName Bitcoin\r
VIAddVersionKey ProductVersion "${VERSION}"\r
VIAddVersionKey CompanyName "${COMPANY}"\r
File /r /x *.exe /x *.o ../src\*.*\r
SetOutPath $INSTDIR\r
WriteRegStr HKCU "${REGKEY}\Components" Main 1\r
+ \r
+ # Remove old wxwidgets-based-bitcoin executable and locales:\r
+ Delete /REBOOTOK $INSTDIR\bitcoin.exe\r
+ RMDir /r /REBOOTOK $INSTDIR\locale\r
SectionEnd\r
\r
Section -post SEC0001\r