| OLD | NEW |
|---|
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 #ifndef SkPreConfig_DEFINED | 10 #ifndef SkPreConfig_DEFINED |
| 11 #define SkPreConfig_DEFINED | 11 #define SkPreConfig_DEFINED |
| 12 | 12 |
| 13 #ifdef WEBKIT_VERSION_MIN_REQUIRED | 13 #ifdef WEBKIT_VERSION_MIN_REQUIRED |
| 14 #include "config.h" | 14 #include "config.h" |
| 15 #endif | 15 #endif |
| 16 | 16 |
| 17 // Allows embedders that want to disable macros that take arguments to just | 17 // Allows embedders that want to disable macros that take arguments to just |
| 18 // define that symbol to be one of these | 18 // define that symbol to be one of these |
| 19 // | 19 // |
| 20 #define SK_NOTHING_ARG1(arg1) | 20 #define SK_NOTHING_ARG1(arg1) |
| 21 #define SK_NOTHING_ARG2(arg1, arg2) | 21 #define SK_NOTHING_ARG2(arg1, arg2) |
| 22 #define SK_NOTHING_ARG3(arg1, arg2, arg3) | 22 #define SK_NOTHING_ARG3(arg1, arg2, arg3) |
| 23 | 23 |
| 24 ////////////////////////////////////////////////////////////////////// | 24 ////////////////////////////////////////////////////////////////////// |
| 25 | 25 |
| 26 #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) | 26 #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) |
| 27 | 27 |
| 28 #ifdef __APPLE__ | 28 #ifdef __APPLE__ |
| 29 #include "TargetConditionals.h" | 29 #include "TargetConditionals.h" |
| 30 #endif | 30 #endif |
| 31 | 31 |
| 32 #if defined(PALMOS_SDK_VERSION) | 32 #if defined(WIN32) || defined(__SYMBIAN32__) |
| 33 #define SK_BUILD_FOR_PALM | |
| 34 #elif defined(WIN32) | |
| 35 #define SK_BUILD_FOR_WIN32 | |
| 36 #elif defined(__SYMBIAN32__) | |
| 37 #define SK_BUILD_FOR_WIN32 | 33 #define SK_BUILD_FOR_WIN32 |
| 38 #elif defined(ANDROID) | 34 #elif defined(ANDROID) |
| 39 #define SK_BUILD_FOR_ANDROID | 35 #define SK_BUILD_FOR_ANDROID |
| 40 #elif defined(linux) || defined(__FreeBSD__) || defined(__OpenBSD__) || \ | 36 #elif defined(linux) || defined(__FreeBSD__) || defined(__OpenBSD__) || \ |
| 41 defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__) || \ | 37 defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__) || \ |
| 42 defined(__GLIBC__) || defined(__GNU__) | 38 defined(__GLIBC__) || defined(__GNU__) |
| 43 #define SK_BUILD_FOR_UNIX | 39 #define SK_BUILD_FOR_UNIX |
| 44 #elif TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR | 40 #elif TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR |
| 45 #define SK_BUILD_FOR_IOS | 41 #define SK_BUILD_FOR_IOS |
| 46 #else | 42 #else |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 * | 256 * |
| 261 * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute. | 257 * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute. |
| 262 */ | 258 */ |
| 263 #if SK_HAS_ATTRIBUTE(optimize) | 259 #if SK_HAS_ATTRIBUTE(optimize) |
| 264 # define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1"))) | 260 # define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1"))) |
| 265 #else | 261 #else |
| 266 # define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */ | 262 # define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */ |
| 267 #endif | 263 #endif |
| 268 | 264 |
| 269 #endif | 265 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1268573002:
Remove SK_BUILD_FOR SDL, BREW, and PALM. (Closed)
Base URL: https://skia.googlesource.com/skia.git@master