diff --git a/SConstruct b/SConstruct index d9c348e7d..205bdc7b1 100644 --- a/SConstruct +++ b/SConstruct @@ -111,8 +111,7 @@ class DXXProgram: env.Append(CPPPATH = [os.path.join(program.srcdir, '../physfs'), os.path.join(os.getenv("HOME"), 'Library/Frameworks/SDL.framework/Headers'), '/Library/Frameworks/SDL.framework/Headers']) self.platform_sources = [os.path.join(program.srcdir, f) for f in ['arch/cocoa/SDLMain.m', 'arch/carbon/messagebox.c']] env.Append(FRAMEWORKS = ['ApplicationServices', 'Carbon', 'Cocoa', 'SDL']) - # Look in frameworks for header files - env.Append(CPPFLAGS = ['-F' + os.path.join(os.getenv("HOME"), 'Library/Frameworks'), '-F/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks']) + env.Append(FRAMEWORKPATH = [os.path.join(os.getenv("HOME"), 'Library/Frameworks'), '/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks']) self.libs = [''] env['LIBPATH'] = '../physfs/build/Debug' # Settings to apply to Linux builds diff --git a/arch/cocoa/tool_bundle.py b/arch/cocoa/tool_bundle.py index a3033b797..46d8e00b7 100644 --- a/arch/cocoa/tool_bundle.py +++ b/arch/cocoa/tool_bundle.py @@ -115,7 +115,7 @@ def TOOL_BUNDLE(env): env['BUNDLEPREFIX'] = '' env['BUNDLESUFFIX'] = '' env['BUNDLEDIRSUFFIX'] = '.bundle' - env['FRAMEWORKS'] = ['-framework Carbon', '-framework System'] + #env['FRAMEWORKS'] = ['-framework Carbon', '-framework System'] env['BUNDLE'] = '$SHLINK' env['BUNDLEFLAGS'] = ' -bundle' env['BUNDLECOM'] = '$BUNDLE $BUNDLEFLAGS -o ${TARGET} $SOURCES $_LIBDIRFLAGS $_LIBFLAGS $FRAMEWORKS'