Merge pull request #12 from tomyun/osx-build

Support Mac OS X build
kallisti5 · Sep 9, 2015 · d13b045 · d13b045
2 parents 68bb7d7 + 66a0ae9
commit d13b045
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 5 deletions.
diff --git a/SConstruct b/SConstruct
@@ -30,7 +30,11 @@ if not conf.CheckPKG('sdl2'):
 env = conf.Finish()
 
 env.Append(CPPPATH = ['#src/includes/', '#src/engine/'])
-env.Append(LIBS = ['-lSDL2_mixer', '-lvorbisfile', '-lGL', '-lGLU'])
+env.Append(LIBS = ['-lSDL2_mixer', '-lvorbisfile'])
+if env['PLATFORM'] == 'darwin':
+    env.Append(FRAMEWORKS = ['OpenGL'])
+else:
+    env.Append(LIBS = ['-lGL', '-GLu'])
 env.Append(CFLAGS = ['-g'])
 env.Append(LINKFLAGS = ['-g'])
 env.Append(CPPDEFINES={'VERSION_MAJOR' : '3'})

diff --git a/src/SConscript b/src/SConscript
@@ -49,11 +49,16 @@ engine_sources = [
 	'engine/trans_fx.c'
 ]
 
-if env['PLATFORM'] in ('posix', 'linux', 'freebsd', 'darwin'):
+if env['PLATFORM'] in ('posix', 'linux', 'freebsd'):
 	main_sources += [
 		'osd_linux_cd.c',
 		'osd_keyboard.c',
 	]
+elif env['PLATFORM'] in ('darwin'):
+   main_sources += [
+       'osd_dummy_cd.c',
+       'osd_keyboard.c',
+   ]
 elif env['PLATFORM'] in ('haiku'):
 	main_sources += [
 		'osd_haiku_cd.c',

diff --git a/src/engine/lsmp3.c b/src/engine/lsmp3.c
@@ -40,7 +40,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <ctype.h>
-#if defined(__linux__)
+#if defined(__linux__) || defined(__APPLE__)
 #include <limits.h>
 #endif
 #include <assert.h>

diff --git a/src/engine/pce.h b/src/engine/pce.h
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__APPLE__)
 #include <limits.h>
 #endif
 

diff --git a/src/engine/romdb.c b/src/engine/romdb.c
@@ -9,7 +9,7 @@
 
 #include "romdb.h"
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__APPLE__)
 #include <limits.h>
 #endif
 #include <stdlib.h>

diff --git a/src/includes/osd_sdl_gfx.h b/src/includes/osd_sdl_gfx.h
@@ -6,7 +6,11 @@
 
 #include <SDL.h>
 #include <SDL_endian.h>
+#if defined(__APPLE__)
+#include <OpenGL/glu.h>
+#else
 #include <GL/glu.h>
+#endif
 
 extern uchar *OSD_MESSAGE_SPR;
 

diff --git a/src/osd_sdl_gfx.c b/src/osd_sdl_gfx.c
@@ -371,7 +371,9 @@ osd_gfx_glinit(struct generic_rect* viewport)
 	glDisable(GL_ALPHA_TEST);
 	glDisable(GL_BLEND);
 	glDisable(GL_LIGHTING);
+#if !defined(__APPLE__)
 	glDisable(GL_TEXTURE_3D_EXT);
+#endif
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();