Minor fixes for Windows build.

This commit is contained in:
lotodore
2008-04-24 19:51:29 +00:00
parent 1d5aa18b1b
commit fc0a1371b4
3 changed files with 5 additions and 3 deletions
+1 -1
View File
@@ -271,7 +271,7 @@ win32{
LIBPATH += Release/lib ../SDL/VisualC/SDL/Release ../SDL/VisualC/SDLmain/Release ../SDL_mixer/VisualC/Release LIBPATH += Release/lib ../SDL/VisualC/SDL/Release ../SDL/VisualC/SDLmain/Release ../SDL_mixer/VisualC/Release
#LIBPATH += Debug/lib ../SDL/VisualC/SDL/Debug ../SDL/VisualC/SDLmain/Debug ../SDL_mixer/VisualC/Debug #LIBPATH += Debug/lib ../SDL/VisualC/SDL/Debug ../SDL/VisualC/SDLmain/Debug ../SDL_mixer/VisualC/Debug
LIBS += -lgnutls-openssl LIBS += -llibgnutls-openssl
LIBS += -llibcurl LIBS += -llibcurl
} }
+1 -1
View File
@@ -181,7 +181,7 @@ win32{
DEPENDPATH += src/net/win32/ src/core/win32 DEPENDPATH += src/net/win32/ src/core/win32
SOURCES += src/net/win32/socket_helper.cpp \ SOURCES += src/net/win32/socket_helper.cpp \
src/net/win32/socket_startup.cpp src/net/win32/socket_startup.cpp
INCLUDEPATH += ../boost/ ../GnuTLS/include ../curl/include INCLUDEPATH += ../boost/ ../GnuTLS/include ../curl/include ../zlib
} }
!win32{ !win32{
DEPENDPATH += src/net/linux/ src/core/linux DEPENDPATH += src/net/linux/ src/core/linux
+3 -1
View File
@@ -127,17 +127,19 @@ win32 {
win32-msvc2005{ win32-msvc2005{
LIBS += -llibgnutls-openssl LIBS += -llibgnutls-openssl
LIBS += -llibcurl
} }
win32-g++{ win32-g++{
LIBS += -lgnutls-openssl LIBS += -lgnutls-openssl
LIBS += -lcurl
LIBS += -llibboost_thread-mgw34-mt-1_35 LIBS += -llibboost_thread-mgw34-mt-1_35
LIBS += -llibboost_filesystem-mgw34-mt-1_35 LIBS += -llibboost_filesystem-mgw34-mt-1_35
LIBS += -llibboost_system-mgw34-mt-1_35 LIBS += -llibboost_system-mgw34-mt-1_35
LIBS += -llibboost_program_options-mgw34-mt-1_35 LIBS += -llibboost_program_options-mgw34-mt-1_35
} }
LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32 LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32 -lwldap32
} }
!win32 { !win32 {
DEPENDPATH += src/net/linux/ src/core/linux DEPENDPATH += src/net/linux/ src/core/linux