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

Fixing build problems with new version of gnutls (on mingw-cross-env).

Browse Source
This commit is contained in:
lotodore
2011-11-17 19:45:20 +00:00
parent 535502196b
commit 86f0e58cc4
2 changed files with 11 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+3 -12
View File
@@ -331,13 +331,14 @@ win32 {
-lz \ -lz \
-lssh2 \ -lssh2 \
-lgnutls \ -lgnutls \
-lnettle \
-lgmp \
-lgcrypt \ -lgcrypt \
-lgpg-error \ -lgpg-error \
-lgsasl \ -lgsasl \
-lidn -lidn
debug:LIBPATH += debug/lib debug:LIBPATH += debug/lib
release:LIBPATH += release/lib release:LIBPATH += release/lib
win32-g++-cross {
LIBS += -lsqlite3 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
@@ -346,17 +347,7 @@ win32 {
LIBS += -lboost_iostreams-mt LIBS += -lboost_iostreams-mt
LIBS += -lboost_random-mt LIBS += -lboost_random-mt
LIBS += -lboost_system-mt LIBS += -lboost_system-mt
}
win32-g++ {
SOURCES += ../sqlite/sqlite3.c
!pkth_win64:LIBS += -ltasn1
LIBS += -lboost_thread-mgw45-mt-1_45.dll
LIBS += -lboost_filesystem-mgw45-mt-1_45.dll
LIBS += -lboost_regex-mgw45-mt-1_45
LIBS += -lboost_iostreams-mgw45-mt-1_45.dll
LIBS += -lboost_random-mgw45-mt-1_45.dll
LIBS += -lboost_system-mgw45-mt-1_45.dll
}
LIBS += \ LIBS += \
-lgdi32 \ -lgdi32 \
-lcomdlg32 \ -lcomdlg32 \
pokerth_server.pro
+8 -23
View File
@@ -131,29 +131,14 @@ win32 {
debug:LIBPATH += debug/lib debug:LIBPATH += debug/lib
release:LIBPATH += release/lib release:LIBPATH += release/lib
LIBS += -lssh2 -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn -ltinyxml LIBS += -lssh2 -lgnutls -lnettle -lgmp -lgcrypt -lgpg-error -lgsasl -lidn -ltinyxml -lsqlite3 -lntlm
win32-g++-cross { LIBS += -lboost_thread_win32-mt
LIBS += -lsqlite3 LIBS += -lboost_filesystem-mt
LIBS += -lntlm LIBS += -lboost_regex-mt
LIBS += -lboost_thread_win32-mt LIBS += -lboost_program_options-mt
LIBS += -lboost_filesystem-mt LIBS += -lboost_iostreams-mt
LIBS += -lboost_regex-mt LIBS += -lboost_random-mt
LIBS += -lboost_program_options-mt LIBS += -lboost_system-mt
LIBS += -lboost_iostreams-mt
LIBS += -lboost_random-mt
LIBS += -lboost_system-mt
}
win32-g++ {
SOURCES += ../sqlite/sqlite3.c
!pkth_win64:LIBS += -ltasn1
LIBS += -lboost_thread-mgw45-mt-1_45.dll
LIBS += -lboost_filesystem-mgw45-mt-1_45.dll
LIBS += -lboost_regex-mgw45-mt-1_45
LIBS += -lboost_program_options-mgw45-mt-1_45.dll
LIBS += -lboost_iostreams-mgw45-mt-1_45.dll
LIBS += -lboost_random-mgw45-mt-1_45.dll
LIBS += -lboost_system-mgw45-mt-1_45.dll
}
LIBS += -liconv \ LIBS += -liconv \
-lz \ -lz \