Removed exception-cpp-files. Fixed compilation with latest mingw.

This commit is contained in:
lotodore
2007-09-29 09:16:39 +00:00
parent fc435f2769
commit 80227f4e88
2 changed files with 58 additions and 48 deletions
+6
View File
@@ -240,9 +240,15 @@ win32{
exists( ../boost/stage/lib/libboost_thread-mgw34-mt-1_34_1.a ){ exists( ../boost/stage/lib/libboost_thread-mgw34-mt-1_34_1.a ){
LIBS += -lboost_thread-mgw34-mt-1_34_1 LIBS += -lboost_thread-mgw34-mt-1_34_1
} }
exists( ../boost/stage/lib/libboost_thread-mgw42-mt-1_34_1.a ){
LIBS += -lboost_thread-mgw42-mt-1_34_1
}
exists( ../boost/stage/lib/libboost_filesystem-mgw34-mt-1_34_1.a ){ exists( ../boost/stage/lib/libboost_filesystem-mgw34-mt-1_34_1.a ){
LIBS += -lboost_filesystem-mgw34-mt-1_34_1 LIBS += -lboost_filesystem-mgw34-mt-1_34_1
} }
exists( ../boost/stage/lib/libboost_filesystem-mgw42-mt-1_34_1.a ){
LIBS += -lboost_filesystem-mgw42-mt-1_34_1
}
RC_FILE = pokerth.rc RC_FILE = pokerth.rc
} }
!win32{ !win32{
+52 -48
View File
@@ -1,12 +1,12 @@
# QMake pro-file for the PokerTH dedicated server # QMake pro-file for the PokerTH dedicated server
TEMPLATE = app TEMPLATE = app
CODECFORSRC = UTF-8 CODECFORSRC = UTF-8
INSTALLS += TARGET INSTALLS += TARGET
TARGET.files += bin/* TARGET.files += bin/*
TARGET.path = /usr/bin/ TARGET.path = /usr/bin/
INCLUDEPATH += . \ INCLUDEPATH += . \
src \ src \
src/engine \ src/engine \
@@ -89,78 +89,82 @@ HEADERS += \
src/gui/generic/serverguiwrapper.h \ src/gui/generic/serverguiwrapper.h \
src/core/pokerthexception.h \ src/core/pokerthexception.h \
src/engine/local_engine/localexception.h src/engine/local_engine/localexception.h
SOURCES += \ SOURCES += \
src/pokerth_server.cpp \ src/pokerth_server.cpp
src/core/common/pokerthexception.cpp \
src/engine/local_engine/localexception.cpp win32 {
win32 {
DEPENDPATH += src/net/win32/ src/core/win32 DEPENDPATH += src/net/win32/ src/core/win32
INCLUDEPATH += ../boost/ ../OpenSSL/include INCLUDEPATH += ../boost/ ../OpenSSL/include
LIBPATH += ../boost/stage/lib ../OpenSSL/lib LIBPATH += ../boost/stage/lib ../OpenSSL/lib
LIBPATH += Release/lib LIBPATH += Release/lib
#LIBPATH += Debug/lib #LIBPATH += Debug/lib
LIBS += -lpokerth_lib LIBS += -lpokerth_lib
LIBS += -lssleay32 LIBS += -lssleay32
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
exists( ../boost/stage/lib/libboost_thread-mgw34-mt-1_34_1.a ){ exists( ../boost/stage/lib/libboost_thread-mgw34-mt-1_34_1.a ){
LIBS += -lboost_thread-mgw34-mt-1_34_1 LIBS += -lboost_thread-mgw34-mt-1_34_1
} }
exists( ../boost/stage/lib/libboost_filesystem-mgw34-mt-1_34_1.a ){ exists( ../boost/stage/lib/libboost_thread-mgw42-mt-1_34_1.a ){
LIBS += -lboost_thread-mgw42-mt-1_34_1
}
exists( ../boost/stage/lib/libboost_filesystem-mgw34-mt-1_34_1.a ){
LIBS += -lboost_filesystem-mgw34-mt-1_34_1 LIBS += -lboost_filesystem-mgw34-mt-1_34_1
} }
} exists( ../boost/stage/lib/libboost_filesystem-mgw42-mt-1_34_1.a ){
!win32 { LIBS += -lboost_filesystem-mgw42-mt-1_34_1
}
}
!win32 {
DEPENDPATH += src/net/linux/ src/core/linux DEPENDPATH += src/net/linux/ src/core/linux
SOURCES += src/core/linux/daemon.c SOURCES += src/core/linux/daemon.c
} }
unix : !mac { unix : !mac {
exists( /usr/lib/libboost_thread-mt.so ){ exists( /usr/lib/libboost_thread-mt.so ){
message("Found libboost_thread-mt") message("Found libboost_thread-mt")
LIBS += -lboost_thread-mt LIBS += -lboost_thread-mt
} }
exists( /usr/lib64/libboost_thread-mt.so ){ exists( /usr/lib64/libboost_thread-mt.so ){
message("Found libboost_thread-mt") message("Found libboost_thread-mt")
LIBS += -lboost_thread-mt LIBS += -lboost_thread-mt
} }
exists( /usr/lib/libboost_thread.so ){ exists( /usr/lib/libboost_thread.so ){
message("Found libboost_thread") message("Found libboost_thread")
LIBS += -lboost_thread LIBS += -lboost_thread
} }
exists( /usr/lib64/libboost_thread.so ){ exists( /usr/lib64/libboost_thread.so ){
message("Found libboost_thread") message("Found libboost_thread")
LIBS += -lboost_thread LIBS += -lboost_thread
} }
exists( /usr/lib/libboost_filesystem-mt.so ){ exists( /usr/lib/libboost_filesystem-mt.so ){
message("Found libboost_filesystem-mt") message("Found libboost_filesystem-mt")
LIBS += -lboost_filesystem-mt LIBS += -lboost_filesystem-mt
} }
exists( /usr/lib64/libboost_filesystem-mt.so ){ exists( /usr/lib64/libboost_filesystem-mt.so ){
message("Found libboost_filesystem-mt") message("Found libboost_filesystem-mt")
LIBS += -lboost_filesystem-mt LIBS += -lboost_filesystem-mt
} }
exists( /usr/lib/libboost_filesystem.so ){ exists( /usr/lib/libboost_filesystem.so ){
message("Found libboost_filesystem") message("Found libboost_filesystem")
LIBS += -lboost_filesystem LIBS += -lboost_filesystem
} }
exists( /usr/lib64/libboost_filesystem.so ){ exists( /usr/lib64/libboost_filesystem.so ){
message("Found libboost_filesystem") message("Found libboost_filesystem")
LIBS += -lboost_filesystem LIBS += -lboost_filesystem
} }
LIBPATH += lib LIBPATH += lib
LIBS += -lpokerth_lib LIBS += -lpokerth_lib
LIBS += -lcrypto LIBS += -lcrypto
TARGETDEPS += ./lib/libpokerth_lib.a TARGETDEPS += ./lib/libpokerth_lib.a
## My release static libs ## My release static libs
#LIBS += -lcrypto #LIBS += -lcrypto
} }
#CONFIG += qt thread console embed_manifest_exe warn_on release #CONFIG += qt thread console embed_manifest_exe warn_on release
CONFIG += qt thread console embed_manifest_exe warn_on debug CONFIG += qt thread console embed_manifest_exe warn_on debug
UI_DIR = uics UI_DIR = uics