diff options
| author | Manolo Gouy <Manolo> | 2010-12-23 14:24:29 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2010-12-23 14:24:29 +0000 |
| commit | a8530c73fa2e7a53f0fcef9f391ce3ea6cbd6c4a (patch) | |
| tree | de578f7f2d2ec57d97878c5301b870b5595c0660 /ide/Xcode3 | |
| parent | 122c0e6859149a6a015608fe9d7b7e3d81c3a026 (diff) | |
Adopted use of FL_LIBRARY #define symbol under Mac OS X. This allows to compile
client applications without including Mac OS system headers, with a gain in speed of
compilation and portability. The source files of all FLTK libraries must now be compiled with
-DFL_LIBRARY under Mac OS X. Make, CMake and Xcode project support files
have been modified accordingly.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8113 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'ide/Xcode3')
| -rw-r--r-- | ide/Xcode3/FLTK.xcodeproj/project.pbxproj | 34 | ||||
| -rw-r--r-- | ide/Xcode3/fltk.pch | 3 |
2 files changed, 11 insertions, 26 deletions
diff --git a/ide/Xcode3/FLTK.xcodeproj/project.pbxproj b/ide/Xcode3/FLTK.xcodeproj/project.pbxproj index 963216b53..b5705bb3f 100644 --- a/ide/Xcode3/FLTK.xcodeproj/project.pbxproj +++ b/ide/Xcode3/FLTK.xcodeproj/project.pbxproj @@ -10999,6 +10999,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = fltk.pch; + GCC_PREPROCESSOR_DEFINITIONS = FL_LIBRARY; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, ../../, @@ -11873,8 +11874,6 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = fltk.pch; GCC_PREPROCESSOR_DEFINITIONS = "USING_XCODE=1"; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, @@ -12065,8 +12064,6 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = fltk.pch; GCC_PREPROCESSOR_DEFINITIONS = "USING_XCODE=1"; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, @@ -12561,8 +12558,6 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = fltk.pch; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, ../../, @@ -12594,6 +12589,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = fltk.pch; + GCC_PREPROCESSOR_DEFINITIONS = FL_LIBRARY; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, @@ -12660,8 +12656,6 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = fltk.pch; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, ../../, @@ -12975,8 +12969,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = fltk.pch; GCC_PREPROCESSOR_DEFINITIONS = "USING_XCODE=1"; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, @@ -13047,6 +13039,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = fltk.pch; + GCC_PREPROCESSOR_DEFINITIONS = FL_LIBRARY; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, @@ -13108,8 +13101,6 @@ FRAMEWORK_VERSION = A; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = fltk.pch; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, ../../, @@ -13447,8 +13438,6 @@ FRAMEWORK_VERSION = A; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = fltk.pch; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, ../../, @@ -13791,8 +13780,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = fltk.pch; GCC_PREPROCESSOR_DEFINITIONS = "USING_XCODE=1"; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, @@ -13913,8 +13900,6 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = fltk.pch; GCC_PREPROCESSOR_DEFINITIONS = "USING_XCODE=1"; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, @@ -14074,6 +14059,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = fltk.pch; + GCC_PREPROCESSOR_DEFINITIONS = FL_LIBRARY; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, ../../, @@ -14290,12 +14276,12 @@ AC3226B9FE17327A0476ACA0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)"; + ARCHS = "$(NATIVE_ARCH_ACTUAL)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)"; + ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; @@ -14770,6 +14756,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = fltk.pch; + GCC_PREPROCESSOR_DEFINITIONS = FL_LIBRARY; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, @@ -14801,8 +14788,6 @@ FRAMEWORK_VERSION = A; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = fltk.pch; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, ../../, @@ -15639,8 +15624,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = fltk.pch; GCC_PREPROCESSOR_DEFINITIONS = "USING_XCODE=1"; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, @@ -15769,6 +15752,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = fltk.pch; + GCC_PREPROCESSOR_DEFINITIONS = FL_LIBRARY; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, @@ -15925,8 +15909,6 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = fltk.pch; HEADER_SEARCH_PATHS = ( ../../ide/XCode3/, ../../, diff --git a/ide/Xcode3/fltk.pch b/ide/Xcode3/fltk.pch index b02c91181..83be8d454 100644 --- a/ide/Xcode3/fltk.pch +++ b/ide/Xcode3/fltk.pch @@ -6,3 +6,6 @@ #import <Cocoa/Cocoa.h> #endif +#ifdef FL_LIBRARY +#include <Carbon/Carbon.h> +#endif |
