From 9930b81f940b46b53c6291db57574ecda86f082b Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Fri, 25 Nov 2016 23:10:29 -0400 Subject: [PATCH] The Xcode project now recognizes frameworks placed in love/platform/Xcode/macosx/Frameworks/ when building for macOS (closes issue #1230). --HG-- branch : minor --- platform/xcode/liblove.xcodeproj/project.pbxproj | 12 ++++++++++++ platform/xcode/love.xcodeproj/project.pbxproj | 9 +++++++++ 2 files changed, 21 insertions(+) diff --git a/platform/xcode/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj index 8426b1588..15f44a8d2 100644 --- a/platform/xcode/liblove.xcodeproj/project.pbxproj +++ b/platform/xcode/liblove.xcodeproj/project.pbxproj @@ -4401,6 +4401,7 @@ DYLIB_CURRENT_VERSION = 9.0; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/macosx/Frameworks", /Library/Frameworks, "$(LOCAL_LIBRARY_DIR)/Frameworks", ); @@ -4408,6 +4409,9 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES; HEADER_SEARCH_PATHS = ( "$(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/Lua.framework/Headers, /Library/Frameworks/SDL2.framework/Headers, @@ -4435,6 +4439,7 @@ DYLIB_CURRENT_VERSION = 9.0; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/macosx/Frameworks", /Library/Frameworks, "$(LOCAL_LIBRARY_DIR)/Frameworks", ); @@ -4442,6 +4447,9 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES; HEADER_SEARCH_PATHS = ( "$(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/Lua.framework/Headers, /Library/Frameworks/SDL2.framework/Headers, @@ -4470,6 +4478,7 @@ DYLIB_CURRENT_VERSION = 9.0; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/macosx/Frameworks", /Library/Frameworks, "$(LOCAL_LIBRARY_DIR)/Frameworks", ); @@ -4477,6 +4486,9 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES; HEADER_SEARCH_PATHS = ( "$(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/Lua.framework/Headers, /Library/Frameworks/SDL2.framework/Headers, diff --git a/platform/xcode/love.xcodeproj/project.pbxproj b/platform/xcode/love.xcodeproj/project.pbxproj index 496c34afe..bc38e00b6 100644 --- a/platform/xcode/love.xcodeproj/project.pbxproj +++ b/platform/xcode/love.xcodeproj/project.pbxproj @@ -430,6 +430,7 @@ COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/macosx/Frameworks", /Library/Frameworks, "\"$(SRCROOT)/build/Release\"", "\"$(SRCROOT)/build/Debug\"", @@ -439,6 +440,8 @@ GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/macosx/Frameworks/Lua.framework/Headers", + "$(PROJECT_DIR)/macosx/Frameworks/SDL2.framework/Headers", /Library/Frameworks/Lua.framework/Headers, /Library/Frameworks/SDL2.framework/Headers, ); @@ -458,6 +461,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/macosx/Frameworks", /Library/Frameworks, "\"$(SRCROOT)/build/Release\"", "\"$(SRCROOT)/build/Debug\"", @@ -465,6 +469,8 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/macosx/Frameworks/Lua.framework/Headers", + "$(PROJECT_DIR)/macosx/Frameworks/SDL2.framework/Headers", /Library/Frameworks/Lua.framework/Headers, /Library/Frameworks/SDL2.framework/Headers, ); @@ -841,6 +847,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/macosx/Frameworks", /Library/Frameworks, "\"$(SRCROOT)/build/Release\"", "\"$(SRCROOT)/build/Debug\"", @@ -848,6 +855,8 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/macosx/Frameworks/Lua.framework/Headers", + "$(PROJECT_DIR)/macosx/Frameworks/SDL2.framework/Headers", /Library/Frameworks/Lua.framework/Headers, /Library/Frameworks/SDL2.framework/Headers, );