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

Use MacOS 10.4u SDK (instead of 10.5, which causes libiconv incompatibility). Use libboost 1.34.1 universal as built for adobe open source lib.

Browse Source
This commit is contained in:
lotodore
2007-12-02 20:01:21 +00:00
parent c0693e3b3e
commit 20a6cdf49a
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+4 -5
View File
@@ -361,15 +361,14 @@ mac{
LIBS += -framework SDL_mixer LIBS += -framework SDL_mixer
# standard path for darwinports # standard path for darwinports
# make sure you have a universal version of boost # make sure you have a universal version of boost
LIBS += /opt/local/lib/libboost_thread-gcc40-mt-1_34.a LIBS += /usr/local/lib/libboost_thread-mt-1_34_1.a
LIBS += /opt/local/lib/libboost_filesystem-gcc40-mt-1_34.a LIBS += /usr/local/lib/libboost_filesystem-mt-1_34_1.a
# libraries installed on every mac # libraries installed on every mac
LIBS += -lcrypto -lz -framework Carbon LIBS += -lcrypto -lz -framework Carbon
# set the application icon # set the application icon
RC_FILE = pokerth.icns RC_FILE = pokerth.icns
LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib LIBPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/lib
INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/ INCLUDEPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/include/
INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
INCLUDEPATH += /opt/local/include
} }
pokerth_lib.pro
+1 -2
View File
@@ -197,8 +197,7 @@ mac{
# 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/
INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/ INCLUDEPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/include/
INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
INCLUDEPATH += /opt/local/include
} }
pokerth_server.pro
+4 -5
View File
@@ -209,13 +209,12 @@ mac{
LIBS += -lpokerth_lib LIBS += -lpokerth_lib
# standard path for darwinports # standard path for darwinports
# make sure you have a universal version of boost # make sure you have a universal version of boost
LIBS += /opt/local/lib/libboost_thread-gcc40-mt-1_34.a LIBS += /usr/local/lib/libboost_thread-mt-1_34_1.a
LIBS += /opt/local/lib/libboost_filesystem-gcc40-mt-1_34.a LIBS += /usr/local/lib/libboost_filesystem-mt-1_34_1.a
# libraries installed on every mac # libraries installed on every mac
LIBS += -lcrypto -liconv LIBS += -lcrypto -liconv
# set the application icon # set the application icon
RC_FILE = pokerth.icns RC_FILE = pokerth.icns
LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib LIBPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/lib
INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/ INCLUDEPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/include/
INCLUDEPATH += /opt/local/include
} }
src/core/linux/convhelper.cpp
+8
View File
@@ -36,7 +36,11 @@ ConvHelper::NativeToUtf8(const std::string &inStr)
{ {
string retStr(inStr); string retStr(inStr);
size_t insize = inStr.length(); size_t insize = inStr.length();
#ifdef __APPLE__
const char *inbuf = inStr.data();
#else
char *inbuf = const_cast<char *>(inStr.data()); char *inbuf = const_cast<char *>(inStr.data());
#endif
const size_t c_outsize = insize * 6; // max size of utf-8 char is 6 per input char const size_t c_outsize = insize * 6; // max size of utf-8 char is 6 per input char
size_t outsize = c_outsize; size_t outsize = c_outsize;
@@ -67,7 +71,11 @@ ConvHelper::Utf8ToNative(const std::string &inStr)
{ {
string retStr(inStr); string retStr(inStr);
size_t insize = inStr.length(); size_t insize = inStr.length();
#ifdef __APPLE__
const char *inbuf = inStr.data();
#else
char *inbuf = const_cast<char *>(inStr.data()); char *inbuf = const_cast<char *>(inStr.data());
#endif
const size_t c_outsize = insize; const size_t c_outsize = insize;
size_t outsize = c_outsize; size_t outsize = c_outsize;