From ad41457a17b611601aa881bc8a940264d9b3d0ad Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Tue, 21 Oct 2014 05:11:34 +0200 Subject: [PATCH] (iOS) Add libretro SDK include dir --- .../RetroArch_iOS.xcodeproj/project.pbxproj | 32 ++++++++++++------- .../xcshareddata/RetroArch_iOS.xccheckout | 10 +++--- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj index 097de1d77f..99219294d8 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj @@ -351,7 +351,7 @@ CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -408,8 +408,8 @@ CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 2; @@ -456,15 +456,19 @@ 96AFAE5516C1D4EA009DE44C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - armv7s, - armv7, - ); + ARCHS = ( + armv7s, + armv7, + ); CLANG_CXX_LIBRARY = "libstdc++"; CODE_SIGN_IDENTITY = ""; CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist"; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; + HEADER_SEARCH_PATHS = ( + ../, + "../../libretro-sdk/include", + ); INFOPLIST_FILE = "$(SRCROOT)/iOS/RetroArch-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; LD_NO_PIE = YES; @@ -509,15 +513,19 @@ 96AFAE5616C1D4EA009DE44C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - armv7s, - armv7, - ); + ARCHS = ( + armv7s, + armv7, + ); CLANG_CXX_LIBRARY = "libstdc++"; CODE_SIGN_IDENTITY = ""; CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist"; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; + HEADER_SEARCH_PATHS = ( + ../, + "../../libretro-sdk/include", + ); INFOPLIST_FILE = "$(SRCROOT)/iOS/RetroArch-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; LD_NO_PIE = YES; @@ -590,7 +598,7 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; VALID_ARCHS = "armv7 armv7s"; WRAPPER_EXTENSION = app; }; diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout index 82e3d2c4d0..b0edf4de4d 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout @@ -15,18 +15,18 @@ C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 https://github.com/libretro/RetroArch.git EF363D58F01B3FB341FA6C851870E60E4F080E97 - git://github.com/libretro/common-overlays.git + https://github.com/libretro/common-overlays.git IDESourceControlProjectPath - apple/RetroArch_iOS.xcodeproj/project.xcworkspace + apple/iOS/RetroArch_iOS.xcodeproj IDESourceControlProjectRelativeInstallPathDictionary 76200F0D6584D865E96F58DE862E738E88B23A3C - ../../../.. + ../../../../.. C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 - ../../.. + ../../../.. EF363D58F01B3FB341FA6C851870E60E4F080E97 - ../../../media/overlays + ../../../..media/overlays/ IDESourceControlProjectURL https://github.com/libretro/RetroArch.git