(Apple) Reorganize source tree

This commit is contained in:
meancoot 2013-09-05 01:20:56 -04:00
parent 28babfb74a
commit cb55a1d45a
41 changed files with 62 additions and 44 deletions

View File

@ -14,7 +14,7 @@
*/
#include <IOKit/hid/IOHIDManager.h>
#include "../RetroArch/apple_input.h"
#include "apple/common/apple_input.h"
// NOTE: I pieced this together through trial and error, any corrections are welcome

View File

@ -18,7 +18,7 @@
#import "RetroArch_Apple.h"
#include "rarch_wrapper.h"
#include "../RetroArch/apple_input.h"
#include "apple/common/apple_input.h"
// If USE_XATTR is defined any loaded file will get a com.RetroArch.Core extended attribute
// specifying which core was used to load.

View File

@ -14,9 +14,9 @@
*/
#import <objc/runtime.h>
#import "../RetroArch/RetroArch_Apple.h"
#include "../RetroArch/setting_data.h"
#include "../RetroArch/apple_input.h"
#import "apple/common/RetroArch_Apple.h"
#include "apple/common/setting_data.h"
#include "apple/common/apple_input.h"
#include "driver.h"
#include "input/input_common.h"

View File

@ -8,11 +8,11 @@
/* Begin PBXBuildFile section */
9620F663178FD4D3001B3B81 /* settings.m in Sources */ = {isa = PBXBuildFile; fileRef = 9620F662178FD4D3001B3B81 /* settings.m */; };
9620F6651790004F001B3B81 /* Settings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9620F6641790004F001B3B81 /* Settings.xib */; };
962EE0E2178B3DF6004224FF /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 962EE0E1178B3DF6004224FF /* IOKit.framework */; };
96355CE31788E72A0010DBFA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96355CE21788E72A0010DBFA /* Cocoa.framework */; };
9646869817BBC14E00C5EA69 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 9646869617BBC14E00C5EA69 /* platform.m */; };
965A44C817CC114D0086F78F /* InputBinder.xib in Resources */ = {isa = PBXBuildFile; fileRef = 965A44C717CC114D0086F78F /* InputBinder.xib */; };
964DE7C117D84B34001CBB6C /* InputBinder.xib in Resources */ = {isa = PBXBuildFile; fileRef = 964DE7C317D84B34001CBB6C /* InputBinder.xib */; };
964DE7C417D84B57001CBB6C /* Settings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 964DE7C617D84B57001CBB6C /* Settings.xib */; };
967894931788ECDB00D6CA69 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9678948F1788ECDB00D6CA69 /* InfoPlist.strings */; };
967894941788ECDB00D6CA69 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 967894911788ECDB00D6CA69 /* MainMenu.xib */; };
967894961788ED1100D6CA69 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 967894951788ED1100D6CA69 /* main.m */; };
@ -30,7 +30,6 @@
/* Begin PBXFileReference section */
9620F662178FD4D3001B3B81 /* settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = settings.m; path = OSX/settings.m; sourceTree = SOURCE_ROOT; };
9620F6641790004F001B3B81 /* Settings.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = Settings.xib; path = OSX/Settings.xib; sourceTree = "<group>"; };
962EE0E1178B3DF6004224FF /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = ../../../../../../../System/Library/Frameworks/IOKit.framework; sourceTree = "<group>"; };
96355CDF1788E72A0010DBFA /* RetroArch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch.app; sourceTree = BUILT_PRODUCTS_DIR; };
96355CE21788E72A0010DBFA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@ -39,7 +38,8 @@
96355CE71788E72A0010DBFA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
9646869617BBC14E00C5EA69 /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform.m; path = OSX/platform.m; sourceTree = SOURCE_ROOT; };
9646869717BBC14E00C5EA69 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform.h; path = OSX/platform.h; sourceTree = SOURCE_ROOT; };
965A44C717CC114D0086F78F /* InputBinder.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = InputBinder.xib; path = OSX/InputBinder.xib; sourceTree = "<group>"; };
964DE7C217D84B34001CBB6C /* en */ = {isa = PBXFileReference; lastKnownFileType = file; name = en; path = en.lproj/InputBinder.xib; sourceTree = "<group>"; };
964DE7C517D84B57001CBB6C /* en */ = {isa = PBXFileReference; lastKnownFileType = file; name = en; path = en.lproj/Settings.xib; sourceTree = "<group>"; };
9678948D1788ECCA00D6CA69 /* RetroArch-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "RetroArch-Info.plist"; path = "OSX/RetroArch-Info.plist"; sourceTree = SOURCE_ROOT; };
967894901788ECDB00D6CA69 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = OSX/en.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; };
967894921788ECDB00D6CA69 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = OSX/en.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
@ -80,7 +80,7 @@
isa = PBXGroup;
children = (
962EE0E1178B3DF6004224FF /* IOKit.framework */,
96355CE81788E72A0010DBFA /* RetroArch */,
96355CE81788E72A0010DBFA /* common */,
967894E7178A2E9B00D6CA69 /* Assets */,
96355CE11788E72A0010DBFA /* Frameworks */,
96355CE01788E72A0010DBFA /* Products */,
@ -111,7 +111,7 @@
name = Frameworks;
sourceTree = "<group>";
};
96355CE81788E72A0010DBFA /* RetroArch */ = {
96355CE81788E72A0010DBFA /* common */ = {
isa = PBXGroup;
children = (
9646869617BBC14E00C5EA69 /* platform.m */,
@ -126,7 +126,7 @@
9678949C1788F02600D6CA69 /* utility.m */,
967894951788ED1100D6CA69 /* main.m */,
);
path = RetroArch;
path = common;
sourceTree = "<group>";
};
96355CE91788E72A0010DBFA /* Supporting Files */ = {
@ -145,8 +145,8 @@
967894E8178A2EB400D6CA69 /* modules */,
967894911788ECDB00D6CA69 /* MainMenu.xib */,
C15874EE178F2094001171D4 /* RetroArch.icns */,
9620F6641790004F001B3B81 /* Settings.xib */,
965A44C717CC114D0086F78F /* InputBinder.xib */,
964DE7C617D84B57001CBB6C /* Settings.xib */,
964DE7C317D84B34001CBB6C /* InputBinder.xib */,
);
name = Assets;
sourceTree = "<group>";
@ -205,8 +205,8 @@
967894941788ECDB00D6CA69 /* MainMenu.xib in Resources */,
967894E9178A2EB400D6CA69 /* modules in Resources */,
C15874EF178F2094001171D4 /* RetroArch.icns in Resources */,
9620F6651790004F001B3B81 /* Settings.xib in Resources */,
965A44C817CC114D0086F78F /* InputBinder.xib in Resources */,
964DE7C417D84B57001CBB6C /* Settings.xib in Resources */,
964DE7C117D84B34001CBB6C /* InputBinder.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -230,6 +230,24 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
964DE7C317D84B34001CBB6C /* InputBinder.xib */ = {
isa = PBXVariantGroup;
children = (
964DE7C217D84B34001CBB6C /* en */,
);
name = InputBinder.xib;
path = OSX;
sourceTree = "<group>";
};
964DE7C617D84B57001CBB6C /* Settings.xib */ = {
isa = PBXVariantGroup;
children = (
964DE7C517D84B57001CBB6C /* en */,
);
name = Settings.xib;
path = OSX;
sourceTree = "<group>";
};
9678948F1788ECDB00D6CA69 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (

View File

@ -120,7 +120,7 @@
96AFAE1A16C1D4EA009DE44C = {
isa = PBXGroup;
children = (
96AFAE3316C1D4EA009DE44C /* RetroArch */,
96AFAE3316C1D4EA009DE44C /* common */,
96AFAE9C16C1D976009DE44C /* core */,
966B9CB716E41E7A005B61E1 /* Assets */,
96AFAE2816C1D4EA009DE44C /* Frameworks */,
@ -151,7 +151,7 @@
name = Frameworks;
sourceTree = "<group>";
};
96AFAE3316C1D4EA009DE44C /* RetroArch */ = {
96AFAE3316C1D4EA009DE44C /* common */ = {
isa = PBXGroup;
children = (
9646869417BBBEAE00C5EA69 /* platform.m */,
@ -167,7 +167,7 @@
96355CD11788CF190010DBFA /* RetroArch_Apple.h */,
96337E81176AC6E5004685F3 /* utility.m */,
);
path = RetroArch;
path = common;
sourceTree = "<group>";
};
96AFAE3416C1D4EA009DE44C /* Supporting Files */ = {

View File

@ -17,12 +17,12 @@
#include "general.h"
#ifdef IOS
#include "../iOS/input/BTStack/btdynamic.c"
#include "../iOS/input/BTStack/wiimote.c"
#include "../iOS/input/BTStack/btpad.c"
#include "../iOS/input/BTStack/btpad_ps3.c"
#include "../iOS/input/BTStack/btpad_wii.c"
#include "../iOS/input/BTStack/btpad_queue.c"
#include "apple/iOS/bluetooth/btdynamic.c"
#include "apple/iOS/bluetooth/wiimote.c"
#include "apple/iOS/bluetooth/btpad.c"
#include "apple/iOS/bluetooth/btpad_ps3.c"
#include "apple/iOS/bluetooth/btpad_wii.c"
#include "apple/iOS/bluetooth/btpad_queue.c"
#elif defined(OSX)
#include "../OSX/hid_pad.c"
#endif

View File

@ -17,7 +17,7 @@
#include <dlfcn.h>
#include <CoreFoundation/CFRunLoop.h>
#include "../../../RetroArch/rarch_wrapper.h"
#include "apple/common/rarch_wrapper.h"
#define BUILDING_BTDYNAMIC
#include "btdynamic.h"

View File

@ -20,7 +20,7 @@
#include <stdio.h>
#include <string.h>
#include "../../../RetroArch/rarch_wrapper.h"
#include "apple/common/rarch_wrapper.h"
#include "btdynamic.h"
#include "btpad.h"
#include "btpad_queue.h"

View File

@ -18,7 +18,7 @@
#include <stdlib.h>
#include "boolean.h"
#include "../../../RetroArch/rarch_wrapper.h"
#include "apple/common/rarch_wrapper.h"
#include "btdynamic.h"
#include "btpad.h"
@ -37,7 +37,7 @@ struct btpad_ps3_data
static void btpad_ps3_send_control(struct btpad_ps3_data* device)
{
// TODO: Can this be modified to turn of motion tracking?
// TODO: Can this be modified to turn off motion tracking?
static uint8_t report_buffer[] = {
0x52, 0x01,
0x00, 0x00, 0x00, 0x00, 0x00,

View File

@ -18,7 +18,7 @@
#include <stdlib.h>
#include "boolean.h"
#include "../../../RetroArch/rarch_wrapper.h"
#include "apple/common/rarch_wrapper.h"
#include "btdynamic.h"
#include "btpad.h"

View File

@ -16,7 +16,7 @@
#include <dirent.h>
#include <sys/stat.h>
#import "../RetroArch/RetroArch_Apple.h"
#import "apple/common/RetroArch_Apple.h"
#import "views.h"
#include "conf/config_file.h"

View File

@ -19,12 +19,12 @@
#import "RetroArch_Apple.h"
#include "rarch_wrapper.h"
#include "../RetroArch/apple_input.h"
#include "apple/common/apple_input.h"
#import "views.h"
#include "input/BTStack/btpad.h"
#include "input/BTStack/btdynamic.h"
#include "input/BTStack/btpad.h"
#include "bluetooth/btpad.h"
#include "bluetooth/btdynamic.h"
#include "bluetooth/btpad.h"
#include "file.h"

View File

@ -13,13 +13,13 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#import "../RetroArch/RetroArch_Apple.h"
#import "apple/common/RetroArch_Apple.h"
#import "views.h"
#include "../RetroArch/apple_input.h"
#include "../RetroArch/keycode.h"
#include "input/BTStack/btdynamic.h"
#include "input/BTStack/btpad.h"
#include "apple/common/apple_input.h"
#include "apple/common/keycode.h"
#include "bluetooth/btdynamic.h"
#include "bluetooth/btpad.h"
enum SettingTypes
{

View File

@ -15,7 +15,7 @@
#include <dispatch/dispatch.h>
#include <pthread.h>
#include "../../apple/RetroArch/rarch_wrapper.h"
#include "../../apple/common/rarch_wrapper.h"
#include "../frontend_context.h"

View File

@ -25,7 +25,7 @@
#include "../shader_glsl.h"
#endif
#include "../../apple/RetroArch/rarch_wrapper.h"
#include "../../apple/common/rarch_wrapper.h"
static bool gfx_ctx_bind_api(enum gfx_ctx_api api, unsigned major, unsigned minor)
{

View File

@ -298,8 +298,8 @@ INPUT
#include "../android/native/jni/input_autodetect.c"
#include "../android/native/jni/input_android.c"
#elif defined(IOS) || defined(OSX)
#include "../apple/RetroArch/apple_input.c"
#include "../apple/RetroArch/apple_joypad.c"
#include "../apple/common/apple_input.c"
#include "../apple/common/apple_joypad.c"
#elif defined(__BLACKBERRY_QNX__)
#include "../blackberry-qnx/qnx_input.c"
#endif