LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 08:30:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use a separate preprocessor define for using Framework #includes in OS X (resolves issue #796)

Browse Source
This commit is contained in:
Alex Szpakowski
2013-12-13 02:37:06 -04:00
parent 740347b240
commit eb4fdf3bbe
9 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/macosx/love-framework.xcodeproj/project.pbxproj
+2 -2
View File
@@ -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;
platform/macosx/love.xcodeproj/project.pbxproj
+2
View File
@@ -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;
src/modules/audio/openal/Audio.h
+1 -1
View File
@@ -37,7 +37,7 @@
#include "thread/threads.h"
// OpenAL
#ifdef LOVE_MACOSX
#ifdef LOVE_MACOSX_USE_FRAMEWORKS // Frameworks have different include paths.
#include <OpenAL-Soft/alc.h>
#include <OpenAL-Soft/al.h>
#else
src/modules/audio/openal/Pool.h
+1 -1
View File
@@ -33,7 +33,7 @@
#include "thread/threads.h"
// OpenAL
#ifdef LOVE_MACOSX
#ifdef LOVE_MACOSX_USE_FRAMEWORKS
#include <OpenAL-Soft/alc.h>
#include <OpenAL-Soft/al.h>
#else
src/modules/audio/openal/Source.h
+1 -1
View File
@@ -29,7 +29,7 @@
#include "sound/Decoder.h"
// OpenAL
#ifdef LOVE_MACOSX
#ifdef LOVE_MACOSX_USE_FRAMEWORKS
#include <OpenAL-Soft/alc.h>
#include <OpenAL-Soft/al.h>
#else
src/modules/filesystem/physfs/File.h
+1 -1
View File
@@ -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 <physfs/physfs.h>
#else
#include <physfs.h>
src/modules/font/freetype/Font.h
+1 -1
View File
@@ -25,7 +25,7 @@
#include "font/Font.h"
// FreeType2
#ifdef LOVE_MACOSX
#ifdef LOVE_MACOSX_USE_FRAMEWORKS
#include <freetype/ft2build.h>
#else
#include <ft2build.h>
src/modules/sound/lullaby/GmeDecoder.h
+1 -1
View File
@@ -27,7 +27,7 @@
#include "common/Data.h"
#include "Decoder.h"
#ifdef LOVE_MACOSX
#ifdef LOVE_MACOSX_USE_FRAMEWORKS
#include <Game_Music_Emu/gme.h>
#else
#include <gme.h>
src/modules/sound/lullaby/Mpg123Decoder.h
+1 -1
View File
@@ -26,7 +26,7 @@
#include "Decoder.h"
// libmpg123
#ifdef LOVE_MACOSX
#ifdef LOVE_MACOSX_USE_FRAMEWORKS
#include <mpg123/mpg123.h>
#else
#include <mpg123.h>