The Xcode project now recognizes frameworks placed in love/platform/Xcode/macosx/Frameworks/ when building for macOS (closes issue #1230).

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-11-25 23:10:29 -04:00
parent 2c28eef74a
commit 9930b81f94
2 changed files with 21 additions and 0 deletions
@@ -4401,6 +4401,7 @@
DYLIB_CURRENT_VERSION = 9.0; DYLIB_CURRENT_VERSION = 9.0;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/macosx/Frameworks",
/Library/Frameworks, /Library/Frameworks,
"$(LOCAL_LIBRARY_DIR)/Frameworks", "$(LOCAL_LIBRARY_DIR)/Frameworks",
); );
@@ -4408,6 +4409,9 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/macosx/Frameworks/FreeType.framework/Headers",
"$(PROJECT_DIR)/macosx/Frameworks/Lua.framework/Headers",
"$(PROJECT_DIR)/macosx/Frameworks/SDL2.framework/Headers",
/Library/Frameworks/FreeType.framework/Headers, /Library/Frameworks/FreeType.framework/Headers,
/Library/Frameworks/Lua.framework/Headers, /Library/Frameworks/Lua.framework/Headers,
/Library/Frameworks/SDL2.framework/Headers, /Library/Frameworks/SDL2.framework/Headers,
@@ -4435,6 +4439,7 @@
DYLIB_CURRENT_VERSION = 9.0; DYLIB_CURRENT_VERSION = 9.0;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/macosx/Frameworks",
/Library/Frameworks, /Library/Frameworks,
"$(LOCAL_LIBRARY_DIR)/Frameworks", "$(LOCAL_LIBRARY_DIR)/Frameworks",
); );
@@ -4442,6 +4447,9 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/macosx/Frameworks/FreeType.framework/Headers",
"$(PROJECT_DIR)/macosx/Frameworks/Lua.framework/Headers",
"$(PROJECT_DIR)/macosx/Frameworks/SDL2.framework/Headers",
/Library/Frameworks/FreeType.framework/Headers, /Library/Frameworks/FreeType.framework/Headers,
/Library/Frameworks/Lua.framework/Headers, /Library/Frameworks/Lua.framework/Headers,
/Library/Frameworks/SDL2.framework/Headers, /Library/Frameworks/SDL2.framework/Headers,
@@ -4470,6 +4478,7 @@
DYLIB_CURRENT_VERSION = 9.0; DYLIB_CURRENT_VERSION = 9.0;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/macosx/Frameworks",
/Library/Frameworks, /Library/Frameworks,
"$(LOCAL_LIBRARY_DIR)/Frameworks", "$(LOCAL_LIBRARY_DIR)/Frameworks",
); );
@@ -4477,6 +4486,9 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/macosx/Frameworks/FreeType.framework/Headers",
"$(PROJECT_DIR)/macosx/Frameworks/Lua.framework/Headers",
"$(PROJECT_DIR)/macosx/Frameworks/SDL2.framework/Headers",
/Library/Frameworks/FreeType.framework/Headers, /Library/Frameworks/FreeType.framework/Headers,
/Library/Frameworks/Lua.framework/Headers, /Library/Frameworks/Lua.framework/Headers,
/Library/Frameworks/SDL2.framework/Headers, /Library/Frameworks/SDL2.framework/Headers,
@@ -430,6 +430,7 @@
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/macosx/Frameworks",
/Library/Frameworks, /Library/Frameworks,
"\"$(SRCROOT)/build/Release\"", "\"$(SRCROOT)/build/Release\"",
"\"$(SRCROOT)/build/Debug\"", "\"$(SRCROOT)/build/Debug\"",
@@ -439,6 +440,8 @@
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/macosx/Frameworks/Lua.framework/Headers",
"$(PROJECT_DIR)/macosx/Frameworks/SDL2.framework/Headers",
/Library/Frameworks/Lua.framework/Headers, /Library/Frameworks/Lua.framework/Headers,
/Library/Frameworks/SDL2.framework/Headers, /Library/Frameworks/SDL2.framework/Headers,
); );
@@ -458,6 +461,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/macosx/Frameworks",
/Library/Frameworks, /Library/Frameworks,
"\"$(SRCROOT)/build/Release\"", "\"$(SRCROOT)/build/Release\"",
"\"$(SRCROOT)/build/Debug\"", "\"$(SRCROOT)/build/Debug\"",
@@ -465,6 +469,8 @@
); );
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/macosx/Frameworks/Lua.framework/Headers",
"$(PROJECT_DIR)/macosx/Frameworks/SDL2.framework/Headers",
/Library/Frameworks/Lua.framework/Headers, /Library/Frameworks/Lua.framework/Headers,
/Library/Frameworks/SDL2.framework/Headers, /Library/Frameworks/SDL2.framework/Headers,
); );
@@ -841,6 +847,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/macosx/Frameworks",
/Library/Frameworks, /Library/Frameworks,
"\"$(SRCROOT)/build/Release\"", "\"$(SRCROOT)/build/Release\"",
"\"$(SRCROOT)/build/Debug\"", "\"$(SRCROOT)/build/Debug\"",
@@ -848,6 +855,8 @@
); );
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/macosx/Frameworks/Lua.framework/Headers",
"$(PROJECT_DIR)/macosx/Frameworks/SDL2.framework/Headers",
/Library/Frameworks/Lua.framework/Headers, /Library/Frameworks/Lua.framework/Headers,
/Library/Frameworks/SDL2.framework/Headers, /Library/Frameworks/SDL2.framework/Headers,
); );