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

mac client build adaptions

Browse Source
This commit is contained in:
Kai Philipp
2017-06-24 18:20:49 +02:00
parent 1c5e8792aa
commit ce2638317d
6 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mac_post_make.sh
+2 -2
View File
@@ -9,8 +9,8 @@
# of binary-size if you leave Qt out. # of binary-size if you leave Qt out.
# (see http://trolltech.com/developer/downloads/qt/mac) # (see http://trolltech.com/developer/downloads/qt/mac)
QT_FW_PATH="/Developer/Qt5/5/clang_64/lib" QT_FW_PATH="/Users/$USER/Qt/5.9/clang_64/lib"
QT_PLUGIN_PATH="/Developer/Qt5/5/clang_64/plugins" QT_PLUGIN_PATH="/Users/$USER/Qt/5.9/clang_64/plugins"
SDL_FW_PATH="/Library/Frameworks" SDL_FW_PATH="/Library/Frameworks"
APPLICATION="./pokerth.app" APPLICATION="./pokerth.app"
BINARY="$APPLICATION/Contents/MacOs/pokerth" BINARY="$APPLICATION/Contents/MacOs/pokerth"
pokerth_db.pro
+1 -1
View File
@@ -60,7 +60,7 @@ mac{
CONFIG += x86_64 CONFIG += x86_64
CONFIG -= x86 CONFIG -= x86
CONFIG -= ppc CONFIG -= ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
QMAKE_CXXFLAGS -= -std=gnu++0x QMAKE_CXXFLAGS -= -std=gnu++0x
# for universal-compilation on PPC-Mac uncomment the following line # for universal-compilation on PPC-Mac uncomment the following line
pokerth_game.pro
+18 -13
View File
@@ -576,7 +576,7 @@ mac {
CONFIG += x86_64 CONFIG += x86_64
CONFIG -= x86 CONFIG -= x86
CONFIG -= ppc CONFIG -= ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
QMAKE_CXXFLAGS -= -std=gnu++0x QMAKE_CXXFLAGS -= -std=gnu++0x
# workaround for problems with boost_filesystem exceptions # workaround for problems with boost_filesystem exceptions
@@ -588,19 +588,18 @@ mac {
LIBPATH += lib LIBPATH += lib
# QT dynamic linked framework (see also mac_post_make.sh) # QT dynamic linked framework (see also mac_post_make.sh)
LIBS += -F /Library/Frameworks
LIBS += -framework \ LIBS += -framework \
QtCore QtCore
LIBS += -framework \ LIBS += -framework \
QtGui QtGui
LIBS += -framework \
# SDL and SDL_mixer come as frameworks SDL
LIBS += -framework \ LIBS += -framework \
SDL SDL_mixer
LIBS += -framework \
SDL_mixer
# make sure you have an x86_64 version of boost # make sure you have an x86_64 version of boost
LIBS += /usr/local/lib/libboost_thread.a LIBS += /usr/local/lib/libboost_thread-mt.a
LIBS += /usr/local/lib/libboost_filesystem.a LIBS += /usr/local/lib/libboost_filesystem.a
LIBS += /usr/local/lib/libboost_regex.a LIBS += /usr/local/lib/libboost_regex.a
LIBS += /usr/local/lib/libboost_random.a LIBS += /usr/local/lib/libboost_random.a
@@ -616,15 +615,21 @@ mac {
-lprotobuf \ -lprotobuf \
-lz \ -lz \
-framework \ -framework \
Carbon Cocoa
# set the application icon # set the application icon
RC_FILE = pokerth.icns RC_FILE = pokerth.icns
LIBPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/lib
INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/ LIBPATH += /usr/local/lib
INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers LIBPATH += /usr/local/opt/openssl/lib
INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers LIBPATH += /usr/local/opt/tinyxml/lib
LIBPATH += /usr/local/opt/protobuf/lib
INCLUDEPATH += /usr/local/include INCLUDEPATH += /usr/local/include
INCLUDEPATH += /usr/local/opt/openssl/include
INCLUDEPATH += /usr/local/opt/tinyxml/include
INCLUDEPATH += /usr/local/opt/protobuf/include
INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
} }
OTHER_FILES += docs/infomessage-id-desc.txt OTHER_FILES += docs/infomessage-id-desc.txt
official_server { official_server {
pokerth_lib.pro
+5 -5
View File
@@ -294,17 +294,17 @@ mac{
CONFIG += x86_64 CONFIG += x86_64
CONFIG -= x86 CONFIG -= x86
CONFIG -= ppc CONFIG -= ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
QMAKE_CXXFLAGS -= -std=gnu++0x QMAKE_CXXFLAGS -= -std=gnu++0x
# for universal-compilation on PPC-Mac uncomment the following line # for universal-compilation on PPC-Mac uncomment the following line
# on Intel-Mac you have to comment this line out or build will fail. # on Intel-Mac you have to comment this line out or build will fail.
# QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/ # QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/
LIBPATH += /usr/local/opt/openssl/lib
INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/ INCLUDEPATH += /usr/local/opt/openssl/include
INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
INCLUDEPATH += /usr/local/include INCLUDEPATH += /usr/local/include
INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
} }
android{ android{
pokerth_protocol.pro
+1 -1
View File
@@ -52,7 +52,7 @@ mac {
CONFIG += x86_64 CONFIG += x86_64
CONFIG -= x86 CONFIG -= x86
CONFIG -= ppc CONFIG -= ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
# for universal-compilation on PPC-Mac uncomment the following line # for universal-compilation on PPC-Mac uncomment the following line
# on Intel-Mac you have to comment this line out or build will fail. # on Intel-Mac you have to comment this line out or build will fail.
pokerth_server.pro
+2 -2
View File
@@ -310,7 +310,7 @@ mac {
CONFIG += x86_64 CONFIG += x86_64
CONFIG -= x86 CONFIG -= x86
CONFIG -= ppc CONFIG -= ppc
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
QMAKE_CXXFLAGS -= -std=gnu++0x QMAKE_CXXFLAGS -= -std=gnu++0x
# workaround for problems with boost_filesystem exceptions # workaround for problems with boost_filesystem exceptions
@@ -322,7 +322,7 @@ mac {
LIBPATH += lib LIBPATH += lib
# make sure you have an x86_64 version of boost # make sure you have an x86_64 version of boost
LIBS += /usr/local/lib/libboost_thread.a LIBS += /usr/local/lib/libboost_thread-mt.a
LIBS += /usr/local/lib/libboost_filesystem.a LIBS += /usr/local/lib/libboost_filesystem.a
LIBS += /usr/local/lib/libboost_regex.a LIBS += /usr/local/lib/libboost_regex.a
LIBS += /usr/local/lib/libboost_random.a LIBS += /usr/local/lib/libboost_random.a