From eb4fdf3bbe8a0ca38b2f2eaaf14e29e46ee27f94 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Fri, 13 Dec 2013 02:37:06 -0400 Subject: [PATCH] Use a separate preprocessor define for using Framework #includes in OS X (resolves issue #796) --- platform/macosx/love-framework.xcodeproj/project.pbxproj | 4 ++-- platform/macosx/love.xcodeproj/project.pbxproj | 2 ++ src/modules/audio/openal/Audio.h | 2 +- src/modules/audio/openal/Pool.h | 2 +- src/modules/audio/openal/Source.h | 2 +- src/modules/filesystem/physfs/File.h | 2 +- src/modules/font/freetype/Font.h | 2 +- src/modules/sound/lullaby/GmeDecoder.h | 2 +- src/modules/sound/lullaby/Mpg123Decoder.h | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/platform/macosx/love-framework.xcodeproj/project.pbxproj b/platform/macosx/love-framework.xcodeproj/project.pbxproj index 9527ea842..b5da69f74 100644 --- a/platform/macosx/love-framework.xcodeproj/project.pbxproj +++ b/platform/macosx/love-framework.xcodeproj/project.pbxproj @@ -2340,7 +2340,7 @@ DEAD_CODE_STRIPPING = YES; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_OPTIMIZATION_LEVEL = 3; - GCC_PREPROCESSOR_DEFINITIONS = ""; + GCC_PREPROCESSOR_DEFINITIONS = LOVE_MACOSX_USE_FRAMEWORKS; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; @@ -2376,7 +2376,7 @@ COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ""; + GCC_PREPROCESSOR_DEFINITIONS = LOVE_MACOSX_USE_FRAMEWORKS; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; diff --git a/platform/macosx/love.xcodeproj/project.pbxproj b/platform/macosx/love.xcodeproj/project.pbxproj index 6eeca8095..9c4739788 100644 --- a/platform/macosx/love.xcodeproj/project.pbxproj +++ b/platform/macosx/love.xcodeproj/project.pbxproj @@ -301,6 +301,7 @@ FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES; GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = LOVE_MACOSX_USE_FRAMEWORKS; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = NO; GCC_WARN_ABOUT_MISSING_NEWLINE = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; @@ -354,6 +355,7 @@ FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_INPUT_FILETYPE = automatic; GCC_OPTIMIZATION_LEVEL = 3; + GCC_PREPROCESSOR_DEFINITIONS = LOVE_MACOSX_USE_FRAMEWORKS; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = NO; GCC_WARN_ABOUT_MISSING_NEWLINE = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; diff --git a/src/modules/audio/openal/Audio.h b/src/modules/audio/openal/Audio.h index 1bb0389f8..4663a8b34 100644 --- a/src/modules/audio/openal/Audio.h +++ b/src/modules/audio/openal/Audio.h @@ -37,7 +37,7 @@ #include "thread/threads.h" // OpenAL -#ifdef LOVE_MACOSX +#ifdef LOVE_MACOSX_USE_FRAMEWORKS // Frameworks have different include paths. #include #include #else diff --git a/src/modules/audio/openal/Pool.h b/src/modules/audio/openal/Pool.h index 74244e54c..bbcc3b96d 100644 --- a/src/modules/audio/openal/Pool.h +++ b/src/modules/audio/openal/Pool.h @@ -33,7 +33,7 @@ #include "thread/threads.h" // OpenAL -#ifdef LOVE_MACOSX +#ifdef LOVE_MACOSX_USE_FRAMEWORKS #include #include #else diff --git a/src/modules/audio/openal/Source.h b/src/modules/audio/openal/Source.h index 93824be41..d6defea8c 100644 --- a/src/modules/audio/openal/Source.h +++ b/src/modules/audio/openal/Source.h @@ -29,7 +29,7 @@ #include "sound/Decoder.h" // OpenAL -#ifdef LOVE_MACOSX +#ifdef LOVE_MACOSX_USE_FRAMEWORKS #include #include #else diff --git a/src/modules/filesystem/physfs/File.h b/src/modules/filesystem/physfs/File.h index ff82a4854..b04a7044f 100644 --- a/src/modules/filesystem/physfs/File.h +++ b/src/modules/filesystem/physfs/File.h @@ -25,7 +25,7 @@ #include "filesystem/File.h" // PhysFS -#ifdef LOVE_MACOSX // wacky Mac behavior means different #include syntax! +#ifdef LOVE_MACOSX_USE_FRAMEWORKS #include #else #include diff --git a/src/modules/font/freetype/Font.h b/src/modules/font/freetype/Font.h index b8adf1a3d..4dd79e559 100644 --- a/src/modules/font/freetype/Font.h +++ b/src/modules/font/freetype/Font.h @@ -25,7 +25,7 @@ #include "font/Font.h" // FreeType2 -#ifdef LOVE_MACOSX +#ifdef LOVE_MACOSX_USE_FRAMEWORKS #include #else #include diff --git a/src/modules/sound/lullaby/GmeDecoder.h b/src/modules/sound/lullaby/GmeDecoder.h index 57dbbdaac..f7a1afede 100644 --- a/src/modules/sound/lullaby/GmeDecoder.h +++ b/src/modules/sound/lullaby/GmeDecoder.h @@ -27,7 +27,7 @@ #include "common/Data.h" #include "Decoder.h" -#ifdef LOVE_MACOSX +#ifdef LOVE_MACOSX_USE_FRAMEWORKS #include #else #include diff --git a/src/modules/sound/lullaby/Mpg123Decoder.h b/src/modules/sound/lullaby/Mpg123Decoder.h index 61d571e21..03aebd609 100644 --- a/src/modules/sound/lullaby/Mpg123Decoder.h +++ b/src/modules/sound/lullaby/Mpg123Decoder.h @@ -26,7 +26,7 @@ #include "Decoder.h" // libmpg123 -#ifdef LOVE_MACOSX +#ifdef LOVE_MACOSX_USE_FRAMEWORKS #include #else #include