AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull SDKROOT into a gyp variable, so it can be locally overridden. This

Browse Source 
allows building on Lion or Mountain Lion using XCode 4.4.

http://codereview.appspot.com/6553044/



git-svn-id: http://skia.googlecode.com/svn/trunk@5607 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
senorblanco@chromium.org 2012-09-20 16:10:02 +00:00
parent 867cbd8bc2
commit bc5cbfe4ed
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gyp/common_conditions.gypi
View File

@ -181,7 +181,7 @@
'xcode_settings': {
'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
'SYMROOT': '<(DEPTH)/xcodebuild',
'SDKROOT': 'macosx10.6',
'SDKROOT': '<(skia_osx_sdkroot)',
# trying to get this to work, but it needs clang I think...
# 'WARNING_CFLAGS': '-Wexit-time-destructors',
'CLANG_WARN_CXX0X_EXTENSIONS': 'NO',

2
gyp/common_variables.gypi
View File

@ -78,6 +78,7 @@
'android_make_apk%': 1,
'skia_nacl%': 0,
'skia_gpu%': 1,
'skia_osx_sdkroot%': 'macosx10.6',
},
# Re-define all variables defined within the level-2 'variables' dict,
@ -94,6 +95,7 @@
'android_make_apk%': '<(android_make_apk)',
'skia_nacl%': '<(skia_nacl)',
'skia_gpu%': '<(skia_gpu)',
'skia_osx_sdkroot%': '<(skia_osx_sdkroot)',
'skia_static_initializers%': '<(skia_static_initializers)',
# These are referenced by our .gypi files that list files (e.g. core.gypi)