Index: gyp/core.gyp |
=================================================================== |
--- gyp/core.gyp (revision 10251) |
+++ gyp/core.gyp (working copy) |
@@ -8,6 +8,25 @@ |
'standalone_static_library': 1, |
'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76', |
+ 'variables': { |
+ 'variables': { 'conditions': [ |
+ [ 'skia_os == "win"', { |
+ 'skia_atomics_impl': 'win', |
+ 'skia_mutex_impl': 'win', |
+ }, { |
djsollen
2013/07/25 16:00:34
Is this where we are supposed to put the android f
bungeman-skia
2013/09/26 17:16:23
Yes, when we get a skia_android_framework I suppos
|
+ 'skia_atomics_impl': 'sync', |
+ 'skia_mutex_impl': 'pthread', |
+ }], |
+ ]}, |
+ 'skia_atomics_header': 'SkAtomics_<(skia_atomics_impl).h', |
+ 'skia_mutex_header': 'SkMutex_<(skia_mutex_impl).h', |
+ }, |
+ |
+ 'defines': [ |
+ 'SK_ATOMICS_PLATFORM_H="<(skia_atomics_header)"', |
+ 'SK_MUTEX_PLATFORM_H="<(skia_mutex_header)"', |
+ ], |
+ |
'includes': [ |
'core.gypi', |
], |
@@ -23,6 +42,7 @@ |
'../include/xml', |
'../src/core', |
'../src/image', |
+ '../src/ports', |
], |
'sources': [ |
'core.gypi', # Makes the gypi appear in IDEs (but does not modify the build). |
@@ -95,6 +115,15 @@ |
], |
}], |
], |
+ 'all_dependent_settings': { |
+ 'defines': [ |
+ 'SK_ATOMICS_PLATFORM_H="<(skia_atomics_header)"', |
+ 'SK_MUTEX_PLATFORM_H="<(skia_mutex_header)"', |
+ ], |
+ 'include_dirs': [ |
+ '../src/ports', |
+ ], |
+ }, |
'direct_dependent_settings': { |
'include_dirs': [ |
'config', |