diff options
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/SCsub | 2 | ||||
| -rw-r--r-- | platform/osx/detect.py | 9 | ||||
| -rw-r--r-- | platform/osx/platform_config.h | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/platform/osx/SCsub b/platform/osx/SCsub index 4169795519..217dee81eb 100644 --- a/platform/osx/SCsub +++ b/platform/osx/SCsub @@ -1,3 +1,5 @@ +#!/usr/bin/env python + Import('env') files = [ diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 01ea09fa21..f8b2153aee 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -28,9 +28,6 @@ def get_opts(): def get_flags(): return [ - ('legacygl', 'yes'), - ('builtin_zlib', 'no'), - ('glew', 'yes'), ] @@ -83,10 +80,6 @@ def configure(env): env['AS'] = basecmd+"as" -# env.Append(CPPPATH=['#platform/osx/include/freetype2', '#platform/osx/include']) -# env.Append(LIBPATH=['#platform/osx/lib']) - - env.Append(CPPFLAGS=["-DAPPLE_STYLE_KEYS"]) env.Append(CPPFLAGS=['-DUNIX_ENABLED','-DGLES2_ENABLED','-DOSX_ENABLED']) env.Append(LIBS=['pthread']) @@ -109,4 +102,4 @@ def configure(env): env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } ) #env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } ) - env["x86_opt_gcc"]=True + env["x86_libtheora_opt_gcc"]=True diff --git a/platform/osx/platform_config.h b/platform/osx/platform_config.h index 86505206ae..f02a4bc444 100644 --- a/platform/osx/platform_config.h +++ b/platform/osx/platform_config.h @@ -27,5 +27,5 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include <alloca.h> -#define GLES2_INCLUDE_H "gl_context/GL/glew.h" +#define GLES2_INCLUDE_H "GL/glew.h" #define PTHREAD_RENAME_SELF |