sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing native Windows build.

Browse Source
This commit is contained in:
lotodore
2010-12-20 18:27:48 +00:00
parent d44d3ce2cf
commit b6d2e61fd8
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+11 -7
View File
@@ -299,8 +299,7 @@ TRANSLATIONS = ts/pokerth_af.ts \
LIBS += -lpokerth_lib \ LIBS += -lpokerth_lib \
-lpokerth_db \ -lpokerth_db \
-lpokerth_protocol \ -lpokerth_protocol \
-lcurl \ -lcurl
-lsqlite3
win32 { win32 {
DEFINES += CURL_STATICLIB DEFINES += CURL_STATICLIB
@@ -314,6 +313,7 @@ win32 {
../GnuTLS/include \ ../GnuTLS/include \
../gsasl/include \ ../gsasl/include \
../curl/include \ ../curl/include \
../sqlite \
../zlib ../zlib
LIBPATH += ../boost/stage/lib \ LIBPATH += ../boost/stage/lib \
../GnuTLS/lib \ ../GnuTLS/lib \
@@ -337,6 +337,7 @@ win32 {
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn LIBS += -lgnutls-openssl -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn
} }
win32-g++-cross { win32-g++-cross {
LIBS += -lsqlite3
LIBS += -lntlm -lmikmod -lddraw -ldxguid -lsmpeg -lvorbisfile -lvorbis -logg LIBS += -lntlm -lmikmod -lddraw -ldxguid -lsmpeg -lvorbisfile -lvorbis -logg
LIBS += -lboost_thread_win32-mt LIBS += -lboost_thread_win32-mt
LIBS += -lboost_filesystem-mt LIBS += -lboost_filesystem-mt
@@ -345,12 +346,13 @@ win32 {
LIBS += -lboost_system-mt LIBS += -lboost_system-mt
} }
win32-g++ { win32-g++ {
SOURCES += ../sqlite/sqlite3.c
!pkth_win64:LIBS += -ltasn1 !pkth_win64:LIBS += -ltasn1
LIBS += -lboost_thread-mgw45-mt-1_44.dll LIBS += -lboost_thread-mgw45-mt-1_45.dll
LIBS += -lboost_filesystem-mgw45-mt-1_44.dll LIBS += -lboost_filesystem-mgw45-mt-1_45.dll
LIBS += -lboost_regex-mgw45-mt-1_44 LIBS += -lboost_regex-mgw45-mt-1_45
LIBS += -lboost_iostreams-mgw45-mt-1_44.dll LIBS += -lboost_iostreams-mgw45-mt-1_45.dll
LIBS += -lboost_system-mgw45-mt-1_44.dll LIBS += -lboost_system-mgw45-mt-1_45.dll
} }
LIBS += \ LIBS += \
-lgdi32 \ -lgdi32 \
@@ -447,6 +449,7 @@ unix:!mac {
UNAME = $$system(uname -s) UNAME = $$system(uname -s)
BSD = $$find(UNAME, "BSD") BSD = $$find(UNAME, "BSD")
kFreeBSD = $$find(UNAME, "kFreeBSD") kFreeBSD = $$find(UNAME, "kFreeBSD")
LIBS += -lsqlite3
LIBS += $$BOOST_LIBS LIBS += $$BOOST_LIBS
LIBS += -lSDL_mixer \ LIBS += -lSDL_mixer \
-lgsasl -lgsasl
@@ -509,6 +512,7 @@ mac {
# libraries installed on every mac # libraries installed on every mac
LIBS += -lcrypto \ LIBS += -lcrypto \
-lssl \ -lssl \
-lsqlite3 \
-lz \ -lz \
-framework \ -framework \
Carbon Carbon
pokerth_lib.pro
+3 -1
View File
@@ -227,7 +227,9 @@ win32{
DEFINES += CURL_STATICLIB DEFINES += CURL_STATICLIB
DEFINES += _WIN32_WINNT=0x0501 DEFINES += _WIN32_WINNT=0x0501
DEPENDPATH += src/net/win32/ src/core/win32 DEPENDPATH += src/net/win32/ src/core/win32
INCLUDEPATH += ../boost/ ../GnuTLS/include ../gsasl/include ../curl/include ../zlib ../openssl/include win32-g++ {
INCLUDEPATH += ../boost/ ../GnuTLS/include ../gsasl/include ../curl/include ../zlib ../sqlite ../openssl/include
}
} }
!win32{ !win32{
##### My release static build options ##### My release static build options
pokerth_server.pro
+12 -9
View File
@@ -115,14 +115,13 @@ SOURCES += \
LIBS += -lpokerth_lib \ LIBS += -lpokerth_lib \
-lpokerth_db \ -lpokerth_db \
-lpokerth_protocol \ -lpokerth_protocol \
-lcurl \ -lcurl
-lsqlite3
win32 { win32 {
DEFINES += CURL_STATICLIB DEFINES += CURL_STATICLIB
DEFINES += _WIN32_WINNT=0x0501 DEFINES += _WIN32_WINNT=0x0501
DEPENDPATH += src/net/win32/ src/core/win32 DEPENDPATH += src/net/win32/ src/core/win32
INCLUDEPATH += ../boost/ ../GnuTLS/include ../gsasl/include INCLUDEPATH += ../sqlite ../boost/ ../GnuTLS/include ../gsasl/include
SOURCES += src/core/win32/convhelper.cpp SOURCES += src/core/win32/convhelper.cpp
@@ -138,6 +137,7 @@ win32 {
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn LIBS += -lgnutls-openssl -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn
} }
win32-g++-cross { win32-g++-cross {
LIBS += -lsqlite3
LIBS += -lntlm LIBS += -lntlm
LIBS += -lboost_thread_win32-mt LIBS += -lboost_thread_win32-mt
LIBS += -lboost_filesystem-mt LIBS += -lboost_filesystem-mt
@@ -147,13 +147,14 @@ win32 {
LIBS += -lboost_system-mt LIBS += -lboost_system-mt
} }
win32-g++ { win32-g++ {
SOURCES += ../sqlite/sqlite3.c
!pkth_win64:LIBS += -ltasn1 !pkth_win64:LIBS += -ltasn1
LIBS += -lboost_thread-mgw45-mt-1_44.dll LIBS += -lboost_thread-mgw45-mt-1_45.dll
LIBS += -lboost_filesystem-mgw45-mt-1_44.dll LIBS += -lboost_filesystem-mgw45-mt-1_45.dll
LIBS += -lboost_regex-mgw45-mt-1_44 LIBS += -lboost_regex-mgw45-mt-1_45
LIBS += -lboost_program_options-mgw45-mt-1_44.dll LIBS += -lboost_program_options-mgw45-mt-1_45.dll
LIBS += -lboost_iostreams-mgw45-mt-1_44.dll LIBS += -lboost_iostreams-mgw45-mt-1_45.dll
LIBS += -lboost_system-mgw45-mt-1_44.dll LIBS += -lboost_system-mgw45-mt-1_45.dll
} }
LIBS += -liconv \ LIBS += -liconv \
@@ -271,6 +272,7 @@ unix : !mac {
kFreeBSD = $$find(UNAME, "kFreeBSD") kFreeBSD = $$find(UNAME, "kFreeBSD")
LIBS += $$BOOST_LIBS LIBS += $$BOOST_LIBS
LIBS += -lsqlite3
LIBS += -lgsasl LIBS += -lgsasl
!isEmpty( BSD ): isEmpty( kFreeBSD ){ !isEmpty( BSD ): isEmpty( kFreeBSD ){
LIBS += -lcrypto -liconv LIBS += -lcrypto -liconv
@@ -313,6 +315,7 @@ mac {
LIBS += /usr/local/lib/libgsasl.a LIBS += /usr/local/lib/libgsasl.a
# libraries installed on every mac # libraries installed on every mac
LIBS += -lsqlite3
LIBS += -lcrypto -lssl -lz -liconv LIBS += -lcrypto -lssl -lz -liconv
# set the application icon # set the application icon
RC_FILE = pokerth.icns RC_FILE = pokerth.icns