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

Trying to fix broken MacOS build.

Browse Source
This commit is contained in:
lotodore
2008-05-16 18:47:44 +00:00
parent 269eab4774
commit d6979236a6
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+4 -3
View File
@@ -391,10 +391,11 @@ 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 += /usr/local/lib/libboost_thread-mt-1_34_1.a LIBS += /usr/local/lib/libboost_thread-mt-1_35.a
LIBS += /usr/local/lib/libboost_filesystem-mt-1_34_1.a LIBS += /usr/local/lib/libboost_filesystem-mt-1_35.a
LIBS += /usr/local/lib/libboost_iostreams-mt-1_35.a
# libraries installed on every mac # libraries installed on every mac
LIBS += -lgnutls-openssl -lgcrypt -lz -lcurl -framework Carbon LIBS += -lcrypto -lz -lcurl -framework Carbon
# set the application icon # set the application icon
RC_FILE = pokerth.icns RC_FILE = pokerth.icns
LIBPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/lib LIBPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/lib
pokerth_server.pro
+5 -4
View File
@@ -227,11 +227,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 += /usr/local/lib/libboost_thread-mt-1_34_1.a LIBS += /usr/local/lib/libboost_thread-mt-1_35.a
LIBS += /usr/local/lib/libboost_filesystem-mt-1_34_1.a LIBS += /usr/local/lib/libboost_filesystem-mt-1_35.a
LIBS += /usr/local/lib/libboost_program_options-mt-1_34_1.a LIBS += /usr/local/lib/libboost_iostreams-mt-1_35.a
LIBS += /usr/local/lib/libboost_program_options-mt-1_35.a
# libraries installed on every mac # libraries installed on every mac
LIBS += -lgnutls-openssl -lgcrypt -liconv LIBS += -lcrypto -lz -lcurl -liconv
# set the application icon # set the application icon
RC_FILE = pokerth.icns RC_FILE = pokerth.icns
LIBPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/lib LIBPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/lib
src/core/openssl_wrapper.h
+10 -2
View File
@@ -16,7 +16,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
/* Wrapper for GnuTLS openssl include. Needed for Windows compatibility. */ /* Wrapper for GnuTLS openssl include. Needed for Windows/MacOS compatibility. */
#ifndef _OPENSSL_WRAPPER_H_ #ifndef _OPENSSL_WRAPPER_H_
#define _OPENSSL_WRAPPER_H_ #define _OPENSSL_WRAPPER_H_
@@ -40,6 +40,14 @@
#undef X509_NAME // Again for Windows - conflict with WinCrypt.h. #undef X509_NAME // Again for Windows - conflict with WinCrypt.h.
#endif #endif
#include <gnutls/openssl.h> #if defined(__APPLE__) || defined(__OpenBSD__) || (defined(__FreeBSD__)
// For BSD-Systems, we assume that OpenSSL is part of the operating system.
#include <openssl/md5.h>
#include <openssl/rand.h>
#else
// For all other systems, we use GnuTLS.
#include <gnutls/openssl.h>
#define PKTH_USE_GNUTLS
#endif
#endif #endif
src/net/common/socket_startup_cmn.cpp
+6
View File
@@ -20,6 +20,9 @@
#include <net/socket_startup.h> #include <net/socket_startup.h>
#include <net/socket_helper.h> #include <net/socket_helper.h>
#include <core/openssl_wrapper.h> #include <core/openssl_wrapper.h>
#ifdef PKTH_USE_GNUTLS
#include <gcrypt.h> #include <gcrypt.h>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <boost/version.hpp> // solve compatibility issues #include <boost/version.hpp> // solve compatibility issues
@@ -62,12 +65,15 @@ extern "C" {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
}; };
} }
#endif // PKTH_USE_GNUTLS
bool bool
internal_socket_startup() internal_socket_startup()
{ {
#ifdef PKTH_USE_GNUTLS
gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_boost); gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_boost);
gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0); gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0);
#endif
return SSL_library_init() == 1; return SSL_library_init() == 1;
} }