diff options
| -rw-r--r-- | gyp/utils.gyp | 3 | ||||
| -rw-r--r-- | include/core/SkPreConfig.h | 8 | ||||
| -rw-r--r-- | include/views/SkWindow.h | 6 |
3 files changed, 5 insertions, 12 deletions
diff --git a/gyp/utils.gyp b/gyp/utils.gyp index 429984643b..40014cbd92 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -35,9 +35,6 @@ 'sources': [ 'utils.gypi', # Makes the gypi appear in IDEs (but does not modify the build). ], - 'sources!': [ - '../src/utils/SDL/SkOSWindow_SDL.cpp', - ], 'conditions': [ [ 'skia_os == "mac"', { 'link_settings': { diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 2c1589c173..1e44198e41 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -23,17 +23,13 @@ ////////////////////////////////////////////////////////////////////// -#if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_PALM) && !defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_SDL) && !defined(SK_BUILD_FOR_BREW) +#if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC) #ifdef __APPLE__ #include "TargetConditionals.h" #endif - #if defined(PALMOS_SDK_VERSION) - #define SK_BUILD_FOR_PALM - #elif defined(WIN32) - #define SK_BUILD_FOR_WIN32 - #elif defined(__SYMBIAN32__) + #if defined(WIN32) || defined(__SYMBIAN32__) #define SK_BUILD_FOR_WIN32 #elif defined(ANDROID) #define SK_BUILD_FOR_ANDROID diff --git a/include/views/SkWindow.h b/include/views/SkWindow.h index 5fa3afcd11..70241b5ff6 100644 --- a/include/views/SkWindow.h +++ b/include/views/SkWindow.h @@ -118,7 +118,9 @@ private: //////////////////////////////////////////////////////////////////////////////// -#if defined(SK_BUILD_FOR_MAC) +#if defined(SK_USE_SDL) + #include "SkOSWindow_SDL.h" +#elif defined(SK_BUILD_FOR_MAC) #include "SkOSWindow_Mac.h" #elif defined(SK_BUILD_FOR_WIN) #include "SkOSWindow_Win.h" @@ -126,8 +128,6 @@ private: #include "SkOSWindow_Android.h" #elif defined(SK_BUILD_FOR_UNIX) #include "SkOSWindow_Unix.h" -#elif defined(SK_BUILD_FOR_SDL) - #include "SkOSWindow_SDL.h" #elif defined(SK_BUILD_FOR_IOS) #include "SkOSWindow_iOS.h" #endif |