TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

For SCons in Mac OS X, make sure the frameworks are linked properly

Browse source
This commit is contained in:
Chris Taylor 2013-04-08 16:21:53 +08:00
parent 5ee91b1a8e
commit 175cad804c
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SConstruct
View file

@ -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

2
arch/cocoa/tool_bundle.py
View file

@ -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'