diff --git a/docs/win32_build_scripts/pokerth_download_libs.cmd b/docs/win32_build_scripts/pokerth_download_libs.cmd index 12e1a764..6707e254 100644 --- a/docs/win32_build_scripts/pokerth_download_libs.cmd +++ b/docs/win32_build_scripts/pokerth_download_libs.cmd @@ -51,26 +51,26 @@ echo The process will start if you press any other key. pause echo. echo Downloading mingw packages -%PKTH_OldDir%\third_party_apps\curl -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/gcc-core-3.4.5-20060117-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/gcc-g++-3.4.5-20060117-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/binutils-2.18.50-20080109-2.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.1-mingw32-dev.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.1-mingw32-dll.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/w32api-3.11.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw32-make-3.81-20080326-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw-utils-0.3.tar.gz +%PKTH_OldDir%\third_party_apps\curl -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/tdm-gcc/gcc-4.3.3-tdm-1-core.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/tdm-gcc/gcc-4.3.3-tdm-1-g++.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/binutils-2.19.1-mingw32-bin.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.2-mingw32-dev.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingwrt-3.15.2-mingw32-dll.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/w32api-3.11.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw32-make-3.81-20080326-3.tar.gz -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/mingw/mingw-utils-0.3.tar.gz if not errorlevel 0 goto downloadFailed echo. echo Unpacking mingw packages mkdir mingw -%PKTH_OldDir%\third_party_apps\7za x -y gcc-core-3.4.5-20060117-3.tar.gz -%PKTH_OldDir%\third_party_apps\7za x -y -omingw gcc-core-3.4.5-20060117-3.tar -del gcc-core-3.4.5-20060117-3.tar -%PKTH_OldDir%\third_party_apps\7za x -y gcc-g++-3.4.5-20060117-3.tar.gz -%PKTH_OldDir%\third_party_apps\7za x -y -omingw gcc-g++-3.4.5-20060117-3.tar -del gcc-g++-3.4.5-20060117-3.tar -%PKTH_OldDir%\third_party_apps\7za x -y binutils-2.18.50-20080109-2.tar.gz -%PKTH_OldDir%\third_party_apps\7za x -y -omingw binutils-2.18.50-20080109-2.tar -del binutils-2.18.50-20080109-2.tar -%PKTH_OldDir%\third_party_apps\7za x -y mingwrt-3.15.1-mingw32-dev.tar.gz -%PKTH_OldDir%\third_party_apps\7za x -y -omingw mingwrt-3.15.1-mingw32-dev.tar -del mingwrt-3.15.1-mingw32-dev.tar -%PKTH_OldDir%\third_party_apps\7za x -y mingwrt-3.15.1-mingw32-dll.tar.gz -%PKTH_OldDir%\third_party_apps\7za x -y -omingw mingwrt-3.15.1-mingw32-dll.tar -del mingwrt-3.15.1-mingw32-dll.tar +%PKTH_OldDir%\third_party_apps\7za x -y gcc-4.3.3-tdm-1-core.tar.gz +%PKTH_OldDir%\third_party_apps\7za x -y -omingw gcc-4.3.3-tdm-1-core.tar +del gcc-4.3.3-tdm-1-core.tar +%PKTH_OldDir%\third_party_apps\7za x -y gcc-4.3.3-tdm-1-g++.tar.gz +%PKTH_OldDir%\third_party_apps\7za x -y -omingw gcc-4.3.3-tdm-1-g++.tar +del gcc-4.3.3-tdm-1-g++.tar +%PKTH_OldDir%\third_party_apps\7za x -y binutils-2.19.1-mingw32-bin.tar.gz +%PKTH_OldDir%\third_party_apps\7za x -y -omingw binutils-2.19.1-mingw32-bin.tar +del binutils-2.19.1-mingw32-bin.tar +%PKTH_OldDir%\third_party_apps\7za x -y mingwrt-3.15.2-mingw32-dev.tar.gz +%PKTH_OldDir%\third_party_apps\7za x -y -omingw mingwrt-3.15.2-mingw32-dev.tar +del mingwrt-3.15.2-mingw32-dev.tar +%PKTH_OldDir%\third_party_apps\7za x -y mingwrt-3.15.2-mingw32-dll.tar.gz +%PKTH_OldDir%\third_party_apps\7za x -y -omingw mingwrt-3.15.2-mingw32-dll.tar +del mingwrt-3.15.2-mingw32-dll.tar %PKTH_OldDir%\third_party_apps\7za x -y w32api-3.11.tar.gz %PKTH_OldDir%\third_party_apps\7za x -y -omingw w32api-3.11.tar del w32api-3.11.tar @@ -143,9 +143,9 @@ cd /d %PKTH_BaseDir% if not exist %PKTH_BaseDir%\GnuTLS. ( echo. echo Downloading GnuTLS -%PKTH_OldDir%\third_party_apps\curl -O http://josefsson.org/gnutls4win/gnutls-2.6.3.zip +%PKTH_OldDir%\third_party_apps\curl -O http://josefsson.org/gnutls4win/gnutls-2.6.4.zip mkdir GnuTLS -%PKTH_OldDir%\third_party_apps\7za x -y -oGnuTLS gnutls-2.6.3.zip +%PKTH_OldDir%\third_party_apps\7za x -y -oGnuTLS gnutls-2.6.4.zip REM Wait 5 seconds for the file cache. @ping 127.0.0.1 -n 5 -w 1000 > nul REM Remove files for dynamic linking, we do not want to accidently use them @@ -157,16 +157,16 @@ cd /d %PKTH_BaseDir% if not exist %PKTH_BaseDir%\curl. ( echo. echo Downloading curl -%PKTH_OldDir%\third_party_apps\curl -O http://curl.haxx.se/download/curl-7.19.0.tar.bz2 +%PKTH_OldDir%\third_party_apps\curl -O http://curl.haxx.se/download/curl-7.19.3.tar.bz2 if not errorlevel 0 goto downloadFailed echo. echo Unpacking curl -%PKTH_OldDir%\third_party_apps\7za x -y curl-7.19.0.tar.bz2 -%PKTH_OldDir%\third_party_apps\7za x -y curl-7.19.0.tar -del curl-7.19.0.tar +%PKTH_OldDir%\third_party_apps\7za x -y curl-7.19.3.tar.bz2 +%PKTH_OldDir%\third_party_apps\7za x -y curl-7.19.3.tar +del curl-7.19.3.tar REM Wait 5 seconds for the file cache, else ren might fail. @ping 127.0.0.1 -n 5 -w 1000 > nul -ren curl-7.19.0 curl +ren curl-7.19.3 curl ) echo. echo Compiling curl @@ -237,14 +237,14 @@ cd /d %PKTH_BaseDir% if not exist %PKTH_BaseDir%\svn. ( echo. echo Downloading subversion -%PKTH_OldDir%\third_party_apps\curl -O http://subversion.tigris.org/files/documents/15/44095/svn-win32-1.5.4.zip +%PKTH_OldDir%\third_party_apps\curl -O http://subversion.tigris.org/files/documents/15/44589/svn-win32-1.5.5.zip if not errorlevel 0 goto downloadFailed echo. echo Unpacking subversion -%PKTH_OldDir%\third_party_apps\7za x -y svn-win32-1.5.4.zip +%PKTH_OldDir%\third_party_apps\7za x -y svn-win32-1.5.5.zip REM Wait 5 seconds for the file cache, else ren might fail. @ping 127.0.0.1 -n 5 -w 1000 > nul -ren svn-win32-1.5.4 svn +ren svn-win32-1.5.5 svn ) if not exist %PKTH_BaseDir%\svn\bin\svn.exe goto svnFailure if not exist %PKTH_BaseDir%\pokerth. ( diff --git a/pokerth_game.pro b/pokerth_game.pro index 7eea8e41..36fd112b 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -292,11 +292,11 @@ win32 { LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error LIBS += -lcurl LIBS += -lz - LIBS += -llibboost_thread-mgw34-mt-1_37 - LIBS += -llibboost_filesystem-mgw34-mt-1_37 - LIBS += -llibboost_system-mgw34-mt-1_37 - LIBS += -llibboost_iostreams-mgw34-mt-1_37 - LIBS += -llibboost_zlib-mgw34-mt-1_37 + LIBS += -llibboost_thread-mgw43-mt-1_37 + LIBS += -llibboost_filesystem-mgw43-mt-1_37 + LIBS += -llibboost_system-mgw43-mt-1_37 + LIBS += -llibboost_iostreams-mgw43-mt-1_37 + LIBS += -llibboost_zlib-mgw43-mt-1_37 } LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32 -lsdl -lsdlmain -lsdl_mixer -lwldap32 diff --git a/pokerth_server.pro b/pokerth_server.pro index 00def868..59dd6570 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -134,12 +134,12 @@ win32 { LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error LIBS += -lcurl LIBS += -lz - LIBS += -llibboost_thread-mgw34-mt-1_37 - LIBS += -llibboost_filesystem-mgw34-mt-1_37 - LIBS += -llibboost_system-mgw34-mt-1_37 - LIBS += -llibboost_iostreams-mgw34-mt-1_37 - LIBS += -llibboost_zlib-mgw34-mt-1_37 - LIBS += -llibboost_program_options-mgw34-mt-1_37 + LIBS += -llibboost_thread-mgw43-mt-1_37 + LIBS += -llibboost_filesystem-mgw43-mt-1_37 + LIBS += -llibboost_system-mgw43-mt-1_37 + LIBS += -llibboost_iostreams-mgw43-mt-1_37 + LIBS += -llibboost_zlib-mgw43-mt-1_37 + LIBS += -llibboost_program_options-mgw43-mt-1_37 } LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32 -lwldap32 @@ -169,11 +169,11 @@ unix : !mac { BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt - # - # searching in $PREFIX/lib and $PREFIX/lib64 - # to override the default '/usr' pass PREFIX - # variable to qmake. - # + # + # searching in $PREFIX/lib and $PREFIX/lib64 + # to override the default '/usr' pass PREFIX + # variable to qmake. + # for(dir, LIB_DIRS){ exists($$dir){ for(lib, BOOST_THREAD){ @@ -204,7 +204,7 @@ unix : !mac { } BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS !count(BOOST_LIBS, 4){ - error("Unable to find boost libraries in PREFIX=$${PREFIX}") + error("Unable to find boost libraries in PREFIX=$${PREFIX}") } UNAME = $$system(uname -s)