- merging in changes from weltall for macosx

source/shared_lib/sources/platform/common/platform_common.cpp

@@ -60,6 +60,10 @@
 #include "utf8.h"
 #include "leak_dumper.h"
 
+#ifdef __APPLE__
+#include <mach-o/dyld.h>
+#endif
+
 using namespace Shared::Platform;
 using namespace Shared::Util;
 using namespace std;

source/shared_lib/sources/platform/macosx/gl_wrap.mm

@@ -18,7 +18,7 @@
 #include "sdl_private.h"
 #include "noimpl.h"
 #include "util.h"
-#include "window.h"
+//#include "window.h"
 #include <vector>
 //#include <SDL_image.h>
 #include "leak_dumper.h"

source/shared_lib/sources/platform/miniupnpc/miniupnpc.c

@@ -4,6 +4,11 @@
  * copyright (c) 2005-2011 Thomas Bernard
  * This software is subjet to the conditions detailed in the
  * provided LICENSE file. */
+
+#if defined(__APPLE__)
+#define MACOSX 1
+#define _DARWIN_C_SOURCE 1
+#endif
 #define __EXTENSIONS__ 1
 #if !defined(MACOSX) && !defined(__sun)
 #if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__NetBSD__)

source/shared_lib/sources/platform/unix/gl_wrap.cpp

@@ -31,7 +31,7 @@ namespace Shared { namespace Platform {
 // ======================================
 //	Global Fcs  
 // ======================================
-
+#if !defined(__APPLE__)
 void createGlFontBitmaps(uint32 &base, const string &type, int size, int width,
 						 int charCount, FontMetrics &metrics) {
 
@@ -155,5 +155,6 @@ void createGlFontOutlines(uint32 &base, const string &type, int width,
 	NOIMPL;
 }
 
+#endif
 
 }}//end namespace