From 558cb0f66f9efb2f888dd33d55fc00ca55cd3d78 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 20 Mar 2013 04:30:12 +0100 Subject: [PATCH] (iOS/Griffin) Move ios_input.c and ios_joypad.c compilation to Griffin --- griffin/griffin.c | 3 +++ ios/RetroArch.xcodeproj/project.pbxproj | 12 ------------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/griffin/griffin.c b/griffin/griffin.c index 376e7ffe10..fbc8e5dba4 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -241,6 +241,9 @@ INPUT #elif defined(ANDROID) #include "../android/native/jni/input_autodetect.c" #include "../android/native/jni/input_android.c" +#elif defined(IOS) +#include "../ios/RetroArch/input/ios_input.c" +#include "../ios/RetroArch/input/ios_joypad.c" #elif defined(__BLACKBERRY_QNX__) #include "../playbook/qnx_input.c" #endif diff --git a/ios/RetroArch.xcodeproj/project.pbxproj b/ios/RetroArch.xcodeproj/project.pbxproj index d55a15cfac..8bb9b01034 100644 --- a/ios/RetroArch.xcodeproj/project.pbxproj +++ b/ios/RetroArch.xcodeproj/project.pbxproj @@ -20,7 +20,6 @@ 963F5AC216CC522F009BBD19 /* RASettingsSubList.m in Sources */ = {isa = PBXBuildFile; fileRef = 963F5ABE16CC522F009BBD19 /* RASettingsSubList.m */; }; 963F5AC316CC522F009BBD19 /* RASettingsList.m in Sources */ = {isa = PBXBuildFile; fileRef = 963F5ABF16CC522F009BBD19 /* RASettingsList.m */; }; 963F5AC816CC523B009BBD19 /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 963F5AC516CC523B009BBD19 /* RAGameView.m */; }; - 966B9C8B16E40D44005B61E1 /* ios_joypad.c in Sources */ = {isa = PBXBuildFile; fileRef = 966B9C8716E40D44005B61E1 /* ios_joypad.c */; }; 966B9CA216E418B7005B61E1 /* BTDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 966B9C9116E418B7005B61E1 /* BTDevice.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 966B9CA416E418B7005B61E1 /* BTstackManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 966B9C9C16E418B7005B61E1 /* BTstackManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 966B9CA616E418B7005B61E1 /* wiimote.c in Sources */ = {isa = PBXBuildFile; fileRef = 966B9C9E16E418B7005B61E1 /* wiimote.c */; }; @@ -46,7 +45,6 @@ 96AFAE3816C1D4EA009DE44C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 96AFAE3616C1D4EA009DE44C /* InfoPlist.strings */; }; 96C19C3016D7045700FE8D5A /* config_file_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 96C19C2F16D7045700FE8D5A /* config_file_helper.c */; }; 96F9C26A16F7D9E2002455B3 /* btdynamic.c in Sources */ = {isa = PBXBuildFile; fileRef = 96F9C26816F7D9E2002455B3 /* btdynamic.c */; }; - 96F9C26F16F91A64002455B3 /* ios_input.c in Sources */ = {isa = PBXBuildFile; fileRef = 96F9C26E16F91A64002455B3 /* ios_input.c */; }; D48581DE16F823F9004BEB17 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = D48581DD16F823F9004BEB17 /* griffin.c */; }; /* End PBXBuildFile section */ @@ -68,8 +66,6 @@ 963F5ABE16CC522F009BBD19 /* RASettingsSubList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RASettingsSubList.m; sourceTree = ""; }; 963F5ABF16CC522F009BBD19 /* RASettingsList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RASettingsList.m; sourceTree = ""; }; 963F5AC516CC523B009BBD19 /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAGameView.m; sourceTree = ""; }; - 9664F4A116E4409100FB28F9 /* keycode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keycode.h; sourceTree = ""; }; - 966B9C8716E40D44005B61E1 /* ios_joypad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ios_joypad.c; sourceTree = ""; }; 966B9C9016E418B7005B61E1 /* BTDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BTDevice.h; sourceTree = ""; }; 966B9C9116E418B7005B61E1 /* BTDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BTDevice.m; sourceTree = ""; }; 966B9C9516E418B7005B61E1 /* btstack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = btstack.h; sourceTree = ""; }; @@ -116,8 +112,6 @@ 96C19C2F16D7045700FE8D5A /* config_file_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = config_file_helper.c; sourceTree = ""; }; 96F9C26816F7D9E2002455B3 /* btdynamic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = btdynamic.c; sourceTree = ""; }; 96F9C26916F7D9E2002455B3 /* btdynamic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = btdynamic.h; sourceTree = ""; }; - 96F9C26B16F919CC002455B3 /* ios_input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ios_input.h; sourceTree = ""; }; - 96F9C26E16F91A64002455B3 /* ios_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ios_input.c; sourceTree = ""; }; D48581DD16F823F9004BEB17 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../griffin/griffin.c; sourceTree = ""; }; /* End PBXFileReference section */ @@ -155,10 +149,6 @@ isa = PBXGroup; children = ( 966B9C8F16E418B7005B61E1 /* BTStack */, - 96F9C26E16F91A64002455B3 /* ios_input.c */, - 96F9C26B16F919CC002455B3 /* ios_input.h */, - 966B9C8716E40D44005B61E1 /* ios_joypad.c */, - 9664F4A116E4409100FB28F9 /* keycode.h */, ); path = input; sourceTree = ""; @@ -419,7 +409,6 @@ 963F5AC816CC523B009BBD19 /* RAGameView.m in Sources */, 96096DD816D1ABAF00BF4499 /* RAModuleInfoList.m in Sources */, 96C19C3016D7045700FE8D5A /* config_file_helper.c in Sources */, - 966B9C8B16E40D44005B61E1 /* ios_joypad.c in Sources */, 966B9CA216E418B7005B61E1 /* BTDevice.m in Sources */, 966B9CA416E418B7005B61E1 /* BTstackManager.m in Sources */, 966B9CA616E418B7005B61E1 /* wiimote.c in Sources */, @@ -430,7 +419,6 @@ 966B9CB416E41C07005B61E1 /* RAModuleList.m in Sources */, 96F9C26A16F7D9E2002455B3 /* btdynamic.c in Sources */, D48581DE16F823F9004BEB17 /* griffin.c in Sources */, - 96F9C26F16F91A64002455B3 /* ios_input.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };