diff --git a/shell/ios/emulator/AboutViewController.h b/shell/apple/emulator-ios/AboutViewController.h similarity index 100% rename from shell/ios/emulator/AboutViewController.h rename to shell/apple/emulator-ios/AboutViewController.h diff --git a/shell/ios/emulator/AboutViewController.m b/shell/apple/emulator-ios/AboutViewController.m similarity index 100% rename from shell/ios/emulator/AboutViewController.m rename to shell/apple/emulator-ios/AboutViewController.m diff --git a/shell/ios/emulator/AppDelegate.h b/shell/apple/emulator-ios/AppDelegate.h similarity index 100% rename from shell/ios/emulator/AppDelegate.h rename to shell/apple/emulator-ios/AppDelegate.h diff --git a/shell/ios/emulator/AppDelegate.m b/shell/apple/emulator-ios/AppDelegate.m similarity index 100% rename from shell/ios/emulator/AppDelegate.m rename to shell/apple/emulator-ios/AppDelegate.m diff --git a/shell/ios/emulator/BrowserTableViewController.h b/shell/apple/emulator-ios/BrowserTableViewController.h similarity index 100% rename from shell/ios/emulator/BrowserTableViewController.h rename to shell/apple/emulator-ios/BrowserTableViewController.h diff --git a/shell/ios/emulator/BrowserTableViewController.m b/shell/apple/emulator-ios/BrowserTableViewController.m similarity index 100% rename from shell/ios/emulator/BrowserTableViewController.m rename to shell/apple/emulator-ios/BrowserTableViewController.m diff --git a/shell/ios/emulator/CloudVMUViewController.h b/shell/apple/emulator-ios/CloudVMUViewController.h similarity index 100% rename from shell/ios/emulator/CloudVMUViewController.h rename to shell/apple/emulator-ios/CloudVMUViewController.h diff --git a/shell/ios/emulator/CloudVMUViewController.m b/shell/apple/emulator-ios/CloudVMUViewController.m similarity index 100% rename from shell/ios/emulator/CloudVMUViewController.m rename to shell/apple/emulator-ios/CloudVMUViewController.m diff --git a/shell/ios/emulator/EmulatorView.h b/shell/apple/emulator-ios/EmulatorView.h similarity index 100% rename from shell/ios/emulator/EmulatorView.h rename to shell/apple/emulator-ios/EmulatorView.h diff --git a/shell/ios/emulator/EmulatorView.mm b/shell/apple/emulator-ios/EmulatorView.mm similarity index 100% rename from shell/ios/emulator/EmulatorView.mm rename to shell/apple/emulator-ios/EmulatorView.mm diff --git a/shell/ios/emulator/EmulatorViewController.h b/shell/apple/emulator-ios/EmulatorViewController.h similarity index 100% rename from shell/ios/emulator/EmulatorViewController.h rename to shell/apple/emulator-ios/EmulatorViewController.h diff --git a/shell/ios/emulator/EmulatorViewController.mm b/shell/apple/emulator-ios/EmulatorViewController.mm similarity index 100% rename from shell/ios/emulator/EmulatorViewController.mm rename to shell/apple/emulator-ios/EmulatorViewController.mm diff --git a/shell/ios/emulator/Images.xcassets/AppIcon.appiconset/Contents.json b/shell/apple/emulator-ios/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from shell/ios/emulator/Images.xcassets/AppIcon.appiconset/Contents.json rename to shell/apple/emulator-ios/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/shell/ios/emulator/Images.xcassets/LaunchImage.launchimage/Contents.json b/shell/apple/emulator-ios/Images.xcassets/LaunchImage.launchimage/Contents.json similarity index 100% rename from shell/ios/emulator/Images.xcassets/LaunchImage.launchimage/Contents.json rename to shell/apple/emulator-ios/Images.xcassets/LaunchImage.launchimage/Contents.json diff --git a/shell/ios/emulator/Images/210-octocat.png b/shell/apple/emulator-ios/Images/210-octocat.png similarity index 100% rename from shell/ios/emulator/Images/210-octocat.png rename to shell/apple/emulator-ios/Images/210-octocat.png diff --git a/shell/ios/emulator/Images/210-octocat@2x.png b/shell/apple/emulator-ios/Images/210-octocat@2x.png similarity index 100% rename from shell/ios/emulator/Images/210-octocat@2x.png rename to shell/apple/emulator-ios/Images/210-octocat@2x.png diff --git a/shell/ios/emulator/Images/210-twitterbird.png b/shell/apple/emulator-ios/Images/210-twitterbird.png similarity index 100% rename from shell/ios/emulator/Images/210-twitterbird.png rename to shell/apple/emulator-ios/Images/210-twitterbird.png diff --git a/shell/ios/emulator/Images/210-twitterbird@2x.png b/shell/apple/emulator-ios/Images/210-twitterbird@2x.png similarity index 100% rename from shell/ios/emulator/Images/210-twitterbird@2x.png rename to shell/apple/emulator-ios/Images/210-twitterbird@2x.png diff --git a/shell/ios/emulator/Images/ABXYPad.png b/shell/apple/emulator-ios/Images/ABXYPad.png similarity index 100% rename from shell/ios/emulator/Images/ABXYPad.png rename to shell/apple/emulator-ios/Images/ABXYPad.png diff --git a/shell/ios/emulator/Images/ABXYPad@2x.png b/shell/apple/emulator-ios/Images/ABXYPad@2x.png similarity index 100% rename from shell/ios/emulator/Images/ABXYPad@2x.png rename to shell/apple/emulator-ios/Images/ABXYPad@2x.png diff --git a/shell/ios/emulator/Images/DPad.png b/shell/apple/emulator-ios/Images/DPad.png similarity index 100% rename from shell/ios/emulator/Images/DPad.png rename to shell/apple/emulator-ios/Images/DPad.png diff --git a/shell/ios/emulator/Images/DPad@2x.png b/shell/apple/emulator-ios/Images/DPad@2x.png similarity index 100% rename from shell/ios/emulator/Images/DPad@2x.png rename to shell/apple/emulator-ios/Images/DPad@2x.png diff --git a/shell/ios/emulator/Images/JoystickBackground.png b/shell/apple/emulator-ios/Images/JoystickBackground.png similarity index 100% rename from shell/ios/emulator/Images/JoystickBackground.png rename to shell/apple/emulator-ios/Images/JoystickBackground.png diff --git a/shell/ios/emulator/Images/JoystickBackground@2x.png b/shell/apple/emulator-ios/Images/JoystickBackground@2x.png similarity index 100% rename from shell/ios/emulator/Images/JoystickBackground@2x.png rename to shell/apple/emulator-ios/Images/JoystickBackground@2x.png diff --git a/shell/ios/emulator/Images/JoystickButton.png b/shell/apple/emulator-ios/Images/JoystickButton.png similarity index 100% rename from shell/ios/emulator/Images/JoystickButton.png rename to shell/apple/emulator-ios/Images/JoystickButton.png diff --git a/shell/ios/emulator/Images/JoystickButton@2x.png b/shell/apple/emulator-ios/Images/JoystickButton@2x.png similarity index 100% rename from shell/ios/emulator/Images/JoystickButton@2x.png rename to shell/apple/emulator-ios/Images/JoystickButton@2x.png diff --git a/shell/ios/emulator/Images/LTrigger.png b/shell/apple/emulator-ios/Images/LTrigger.png similarity index 100% rename from shell/ios/emulator/Images/LTrigger.png rename to shell/apple/emulator-ios/Images/LTrigger.png diff --git a/shell/ios/emulator/Images/LTrigger@2x.png b/shell/apple/emulator-ios/Images/LTrigger@2x.png similarity index 100% rename from shell/ios/emulator/Images/LTrigger@2x.png rename to shell/apple/emulator-ios/Images/LTrigger@2x.png diff --git a/shell/ios/emulator/Images/RTrigger.png b/shell/apple/emulator-ios/Images/RTrigger.png similarity index 100% rename from shell/ios/emulator/Images/RTrigger.png rename to shell/apple/emulator-ios/Images/RTrigger.png diff --git a/shell/ios/emulator/Images/RTrigger@2x.png b/shell/apple/emulator-ios/Images/RTrigger@2x.png similarity index 100% rename from shell/ios/emulator/Images/RTrigger@2x.png rename to shell/apple/emulator-ios/Images/RTrigger@2x.png diff --git a/shell/ios/emulator/Images/Start.png b/shell/apple/emulator-ios/Images/Start.png similarity index 100% rename from shell/ios/emulator/Images/Start.png rename to shell/apple/emulator-ios/Images/Start.png diff --git a/shell/ios/emulator/Images/Start@2x.png b/shell/apple/emulator-ios/Images/Start@2x.png similarity index 100% rename from shell/ios/emulator/Images/Start@2x.png rename to shell/apple/emulator-ios/Images/Start@2x.png diff --git a/shell/ios/emulator/Images/menuback.png b/shell/apple/emulator-ios/Images/menuback.png similarity index 100% rename from shell/ios/emulator/Images/menuback.png rename to shell/apple/emulator-ios/Images/menuback.png diff --git a/shell/ios/emulator/Images/menuback@2x.png b/shell/apple/emulator-ios/Images/menuback@2x.png similarity index 100% rename from shell/ios/emulator/Images/menuback@2x.png rename to shell/apple/emulator-ios/Images/menuback@2x.png diff --git a/shell/ios/emulator/Images/menuicon.png b/shell/apple/emulator-ios/Images/menuicon.png similarity index 100% rename from shell/ios/emulator/Images/menuicon.png rename to shell/apple/emulator-ios/Images/menuicon.png diff --git a/shell/ios/emulator/Images/menuicon@2x.png b/shell/apple/emulator-ios/Images/menuicon@2x.png similarity index 100% rename from shell/ios/emulator/Images/menuicon@2x.png rename to shell/apple/emulator-ios/Images/menuicon@2x.png diff --git a/shell/ios/emulator/InputViewController.h b/shell/apple/emulator-ios/InputViewController.h similarity index 100% rename from shell/ios/emulator/InputViewController.h rename to shell/apple/emulator-ios/InputViewController.h diff --git a/shell/ios/emulator/InputViewController.m b/shell/apple/emulator-ios/InputViewController.m similarity index 100% rename from shell/ios/emulator/InputViewController.m rename to shell/apple/emulator-ios/InputViewController.m diff --git a/shell/ios/emulator/MainStoryboard.storyboard b/shell/apple/emulator-ios/MainStoryboard.storyboard similarity index 100% rename from shell/ios/emulator/MainStoryboard.storyboard rename to shell/apple/emulator-ios/MainStoryboard.storyboard diff --git a/shell/ios/emulator/PathsViewController.h b/shell/apple/emulator-ios/PathsViewController.h similarity index 100% rename from shell/ios/emulator/PathsViewController.h rename to shell/apple/emulator-ios/PathsViewController.h diff --git a/shell/ios/emulator/PathsViewController.m b/shell/apple/emulator-ios/PathsViewController.m similarity index 100% rename from shell/ios/emulator/PathsViewController.m rename to shell/apple/emulator-ios/PathsViewController.m diff --git a/shell/ios/emulator/SWRevealViewController.h b/shell/apple/emulator-ios/SWRevealViewController.h similarity index 100% rename from shell/ios/emulator/SWRevealViewController.h rename to shell/apple/emulator-ios/SWRevealViewController.h diff --git a/shell/ios/emulator/SWRevealViewController.m b/shell/apple/emulator-ios/SWRevealViewController.m similarity index 100% rename from shell/ios/emulator/SWRevealViewController.m rename to shell/apple/emulator-ios/SWRevealViewController.m diff --git a/shell/ios/emulator/SettingsViewController.h b/shell/apple/emulator-ios/SettingsViewController.h similarity index 100% rename from shell/ios/emulator/SettingsViewController.h rename to shell/apple/emulator-ios/SettingsViewController.h diff --git a/shell/ios/emulator/SettingsViewController.m b/shell/apple/emulator-ios/SettingsViewController.m similarity index 100% rename from shell/ios/emulator/SettingsViewController.m rename to shell/apple/emulator-ios/SettingsViewController.m diff --git a/shell/ios/emulator/Shaders/Shader.fsh b/shell/apple/emulator-ios/Shaders/Shader.fsh similarity index 100% rename from shell/ios/emulator/Shaders/Shader.fsh rename to shell/apple/emulator-ios/Shaders/Shader.fsh diff --git a/shell/ios/emulator/Shaders/Shader.vsh b/shell/apple/emulator-ios/Shaders/Shader.vsh similarity index 100% rename from shell/ios/emulator/Shaders/Shader.vsh rename to shell/apple/emulator-ios/Shaders/Shader.vsh diff --git a/shell/ios/emulator/SideDrawerViewController.h b/shell/apple/emulator-ios/SideDrawerViewController.h similarity index 100% rename from shell/ios/emulator/SideDrawerViewController.h rename to shell/apple/emulator-ios/SideDrawerViewController.h diff --git a/shell/ios/emulator/SideDrawerViewController.m b/shell/apple/emulator-ios/SideDrawerViewController.m similarity index 100% rename from shell/ios/emulator/SideDrawerViewController.m rename to shell/apple/emulator-ios/SideDrawerViewController.m diff --git a/shell/ios/emulator/assets/Icon-72.png b/shell/apple/emulator-ios/assets/Icon-72.png similarity index 100% rename from shell/ios/emulator/assets/Icon-72.png rename to shell/apple/emulator-ios/assets/Icon-72.png diff --git a/shell/ios/emulator/assets/Icon-72@2x.png b/shell/apple/emulator-ios/assets/Icon-72@2x.png similarity index 100% rename from shell/ios/emulator/assets/Icon-72@2x.png rename to shell/apple/emulator-ios/assets/Icon-72@2x.png diff --git a/shell/ios/emulator/assets/Icon.png b/shell/apple/emulator-ios/assets/Icon.png similarity index 100% rename from shell/ios/emulator/assets/Icon.png rename to shell/apple/emulator-ios/assets/Icon.png diff --git a/shell/ios/emulator/assets/Icon@2x.png b/shell/apple/emulator-ios/assets/Icon@2x.png similarity index 100% rename from shell/ios/emulator/assets/Icon@2x.png rename to shell/apple/emulator-ios/assets/Icon@2x.png diff --git a/shell/ios/emulator/ios_main.mm b/shell/apple/emulator-ios/ios_main.mm similarity index 100% rename from shell/ios/emulator/ios_main.mm rename to shell/apple/emulator-ios/ios_main.mm diff --git a/shell/ios/emulator/loungekatt_storyboard.storyboard b/shell/apple/emulator-ios/loungekatt_storyboard.storyboard similarity index 100% rename from shell/ios/emulator/loungekatt_storyboard.storyboard rename to shell/apple/emulator-ios/loungekatt_storyboard.storyboard diff --git a/shell/ios/emulator/main.m b/shell/apple/emulator-ios/main.m similarity index 100% rename from shell/ios/emulator/main.m rename to shell/apple/emulator-ios/main.m diff --git a/shell/ios/emulator/emulator-Info.plist b/shell/apple/emulator-ios/reicast-ios-Info.plist similarity index 100% rename from shell/ios/emulator/emulator-Info.plist rename to shell/apple/emulator-ios/reicast-ios-Info.plist diff --git a/shell/ios/emulator/emulator-Prefix.pch b/shell/apple/emulator-ios/reicast-ios-Prefix.pch similarity index 100% rename from shell/ios/emulator/emulator-Prefix.pch rename to shell/apple/emulator-ios/reicast-ios-Prefix.pch diff --git a/shell/ios/emulator.xcodeproj/project.pbxproj b/shell/apple/emulator-ios/reicast-ios.xcodeproj/project.pbxproj similarity index 99% rename from shell/ios/emulator.xcodeproj/project.pbxproj rename to shell/apple/emulator-ios/reicast-ios.xcodeproj/project.pbxproj index ff7a81d29..c9ec69a6a 100644 --- a/shell/ios/emulator.xcodeproj/project.pbxproj +++ b/shell/apple/emulator-ios/reicast-ios.xcodeproj/project.pbxproj @@ -256,15 +256,15 @@ 8703BC381A44B8DA00E7E939 /* Icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72@2x.png"; sourceTree = ""; }; 8703BC391A44B8DA00E7E939 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; 8703BC3A1A44B8DA00E7E939 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = ""; }; - 87078A8318A47FE90034C7A0 /* emulator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = emulator.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 87078A8318A47FE90034C7A0 /* reicast-ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "reicast-ios.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 87078A8618A47FE90034C7A0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 87078A8818A47FE90034C7A0 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 87078A8A18A47FE90034C7A0 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 87078A8C18A47FE90034C7A0 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; }; 87078A8E18A47FE90034C7A0 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; - 87078A9218A47FE90034C7A0 /* emulator-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "emulator-Info.plist"; sourceTree = ""; }; + 87078A9218A47FE90034C7A0 /* reicast-ios-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "reicast-ios-Info.plist"; sourceTree = ""; }; 87078A9618A47FE90034C7A0 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 87078A9818A47FE90034C7A0 /* emulator-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "emulator-Prefix.pch"; sourceTree = ""; }; + 87078A9818A47FE90034C7A0 /* reicast-ios-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "reicast-ios-Prefix.pch"; sourceTree = ""; }; 87078A9918A47FE90034C7A0 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 87078A9A18A47FE90034C7A0 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 87078AA218A47FE90034C7A0 /* Shader.fsh */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; name = Shader.fsh; path = Shaders/Shader.fsh; sourceTree = ""; }; @@ -720,7 +720,7 @@ 87078A8418A47FE90034C7A0 /* Products */ = { isa = PBXGroup; children = ( - 87078A8318A47FE90034C7A0 /* emulator.app */, + 87078A8318A47FE90034C7A0 /* reicast-ios.app */, ); name = Products; sourceTree = ""; @@ -766,9 +766,9 @@ isa = PBXGroup; children = ( 8703BC361A44B8DA00E7E939 /* assets */, - 87078A9218A47FE90034C7A0 /* emulator-Info.plist */, + 87078A9218A47FE90034C7A0 /* reicast-ios-Info.plist */, 87078A9618A47FE90034C7A0 /* main.m */, - 87078A9818A47FE90034C7A0 /* emulator-Prefix.pch */, + 87078A9818A47FE90034C7A0 /* reicast-ios-Prefix.pch */, ); name = "Supporting Files"; sourceTree = ""; @@ -1424,9 +1424,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 87078A8218A47FE90034C7A0 /* emulator */ = { + 87078A8218A47FE90034C7A0 /* reicast-ios */ = { isa = PBXNativeTarget; - buildConfigurationList = 87078AC018A47FE90034C7A0 /* Build configuration list for PBXNativeTarget "emulator" */; + buildConfigurationList = 87078AC018A47FE90034C7A0 /* Build configuration list for PBXNativeTarget "reicast-ios" */; buildPhases = ( 87078A7F18A47FE90034C7A0 /* Sources */, 87078A8018A47FE90034C7A0 /* Frameworks */, @@ -1437,9 +1437,9 @@ ); dependencies = ( ); - name = emulator; + name = "reicast-ios"; productName = emulator; - productReference = 87078A8318A47FE90034C7A0 /* emulator.app */; + productReference = 87078A8318A47FE90034C7A0 /* reicast-ios.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -1456,7 +1456,7 @@ }; }; }; - buildConfigurationList = 87078A7E18A47FE90034C7A0 /* Build configuration list for PBXProject "emulator" */; + buildConfigurationList = 87078A7E18A47FE90034C7A0 /* Build configuration list for PBXProject "reicast-ios" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -1469,7 +1469,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 87078A8218A47FE90034C7A0 /* emulator */, + 87078A8218A47FE90034C7A0 /* reicast-ios */, ); }; /* End PBXProject section */ @@ -1811,7 +1811,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "emulator/emulator-Prefix.pch"; + GCC_PREFIX_HEADER = "emulator/reicast-ios-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "GLES=1", "DEBUG=1", @@ -1826,11 +1826,11 @@ ../../core/deps/, ../../core/khronos/, ); - INFOPLIST_FILE = "emulator/emulator-Info.plist"; + INFOPLIST_FILE = "emulator/reicast-ios-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-mno-thumb"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "reicast-ios"; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "armv7 armv7s"; @@ -1845,7 +1845,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "emulator/emulator-Prefix.pch"; + GCC_PREFIX_HEADER = "emulator/reicast-ios-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "GLES=1", "TARGET_IPHONE=1", @@ -1858,11 +1858,11 @@ ../../core/deps/, ../../core/khronos/, ); - INFOPLIST_FILE = "emulator/emulator-Info.plist"; + INFOPLIST_FILE = "emulator/reicast-ios-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-mno-thumb"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "reicast-ios"; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "armv7 armv7s"; @@ -1873,7 +1873,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 87078A7E18A47FE90034C7A0 /* Build configuration list for PBXProject "emulator" */ = { + 87078A7E18A47FE90034C7A0 /* Build configuration list for PBXProject "reicast-ios" */ = { isa = XCConfigurationList; buildConfigurations = ( 87078ABE18A47FE90034C7A0 /* Debug */, @@ -1882,7 +1882,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 87078AC018A47FE90034C7A0 /* Build configuration list for PBXNativeTarget "emulator" */ = { + 87078AC018A47FE90034C7A0 /* Build configuration list for PBXNativeTarget "reicast-ios" */ = { isa = XCConfigurationList; buildConfigurations = ( 87078AC118A47FE90034C7A0 /* Debug */, diff --git a/shell/ios/emulator.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/shell/apple/emulator-ios/reicast-ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 69% rename from shell/ios/emulator.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to shell/apple/emulator-ios/reicast-ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 0c27a0f0d..97eb4d184 100644 --- a/shell/ios/emulator.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/shell/apple/emulator-ios/reicast-ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:reicast-ios.xcodeproj"> diff --git a/shell/ios/emulator/reicast.entitlements b/shell/apple/emulator-ios/reicast.entitlements similarity index 100% rename from shell/ios/emulator/reicast.entitlements rename to shell/apple/emulator-ios/reicast.entitlements diff --git a/shell/osx/emulator-osx/emulator-osx/AppDelegate.swift b/shell/apple/emulator-osx/emulator-osx/AppDelegate.swift similarity index 100% rename from shell/osx/emulator-osx/emulator-osx/AppDelegate.swift rename to shell/apple/emulator-osx/emulator-osx/AppDelegate.swift diff --git a/shell/osx/emulator-osx/emulator-osx/Base.lproj/MainMenu.xib b/shell/apple/emulator-osx/emulator-osx/Base.lproj/MainMenu.xib similarity index 98% rename from shell/osx/emulator-osx/emulator-osx/Base.lproj/MainMenu.xib rename to shell/apple/emulator-osx/emulator-osx/Base.lproj/MainMenu.xib index ec73b4dc6..e41271c6b 100644 --- a/shell/osx/emulator-osx/emulator-osx/Base.lproj/MainMenu.xib +++ b/shell/apple/emulator-osx/emulator-osx/Base.lproj/MainMenu.xib @@ -1,7 +1,6 @@ - @@ -20,11 +19,11 @@ - + - + - + @@ -38,7 +37,7 @@ - + @@ -56,7 +55,7 @@ - + @@ -657,7 +656,7 @@ - + @@ -667,7 +666,7 @@ - + diff --git a/shell/osx/emulator-osx/emulator-osx/EmuGLView.swift b/shell/apple/emulator-osx/emulator-osx/EmuGLView.swift similarity index 100% rename from shell/osx/emulator-osx/emulator-osx/EmuGLView.swift rename to shell/apple/emulator-osx/emulator-osx/EmuGLView.swift diff --git a/shell/osx/emulator-osx/emulator-osx/Images.xcassets/AppIcon.appiconset/Contents.json b/shell/apple/emulator-osx/emulator-osx/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from shell/osx/emulator-osx/emulator-osx/Images.xcassets/AppIcon.appiconset/Contents.json rename to shell/apple/emulator-osx/emulator-osx/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/shell/osx/emulator-osx/emulator-osx/Info.plist b/shell/apple/emulator-osx/emulator-osx/Info.plist similarity index 100% rename from shell/osx/emulator-osx/emulator-osx/Info.plist rename to shell/apple/emulator-osx/emulator-osx/Info.plist diff --git a/shell/osx/emulator-osx/emulator-osx/emulator-osx-Bridging-Header.h b/shell/apple/emulator-osx/emulator-osx/emulator-osx-Bridging-Header.h similarity index 100% rename from shell/osx/emulator-osx/emulator-osx/emulator-osx-Bridging-Header.h rename to shell/apple/emulator-osx/emulator-osx/emulator-osx-Bridging-Header.h diff --git a/shell/osx/emulator-osx/emulator-osx/osx-main.mm b/shell/apple/emulator-osx/emulator-osx/osx-main.mm similarity index 100% rename from shell/osx/emulator-osx/emulator-osx/osx-main.mm rename to shell/apple/emulator-osx/emulator-osx/osx-main.mm diff --git a/shell/osx/emulator-osx/emulator-osxTests/Info.plist b/shell/apple/emulator-osx/emulator-osxTests/Info.plist similarity index 100% rename from shell/osx/emulator-osx/emulator-osxTests/Info.plist rename to shell/apple/emulator-osx/emulator-osxTests/Info.plist diff --git a/shell/osx/emulator-osx/emulator-osxTests/emulator_osxTests.swift b/shell/apple/emulator-osx/emulator-osxTests/emulator_osxTests.swift similarity index 100% rename from shell/osx/emulator-osx/emulator-osxTests/emulator_osxTests.swift rename to shell/apple/emulator-osx/emulator-osxTests/emulator_osxTests.swift diff --git a/shell/osx/emulator-osx/emulator-osx.xcodeproj/project.pbxproj b/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj similarity index 97% rename from shell/osx/emulator-osx/emulator-osx.xcodeproj/project.pbxproj rename to shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj index d1212d2b6..296aac547 100644 --- a/shell/osx/emulator-osx/emulator-osx.xcodeproj/project.pbxproj +++ b/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj @@ -196,17 +196,17 @@ containerPortal = 84A388AB1B1CDD3E000166C0 /* Project object */; proxyType = 1; remoteGlobalIDString = 84A388B21B1CDD3E000166C0; - remoteInfo = "emulator-osx"; + remoteInfo = "reicast-osx"; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 84A388B31B1CDD3E000166C0 /* emulator-osx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "emulator-osx.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 84A388B31B1CDD3E000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 84A388B71B1CDD3E000166C0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 84A388B81B1CDD3E000166C0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 84A388BA1B1CDD3E000166C0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 84A388BD1B1CDD3E000166C0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; - 84A388C31B1CDD3F000166C0 /* emulator-osxTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "emulator-osxTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 84A388C31B1CDD3F000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 84A388C81B1CDD3F000166C0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 84A388C91B1CDD3F000166C0 /* emulator_osxTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = emulator_osxTests.swift; sourceTree = ""; }; 84B7BD121B72720100F9733F /* build.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = build.h; path = ../../../core/build.h; sourceTree = ""; }; @@ -546,8 +546,8 @@ isa = PBXGroup; children = ( 84B7BD111B7271CF00F9733F /* core */, - 84A388B51B1CDD3E000166C0 /* emulator-osx */, - 84A388C61B1CDD3F000166C0 /* emulator-osxTests */, + 84A388B51B1CDD3E000166C0 /* reicast-osx */, + 84A388C61B1CDD3F000166C0 /* reicast-osxTests */, 84A388B41B1CDD3E000166C0 /* Products */, ); sourceTree = ""; @@ -555,13 +555,13 @@ 84A388B41B1CDD3E000166C0 /* Products */ = { isa = PBXGroup; children = ( - 84A388B31B1CDD3E000166C0 /* emulator-osx.app */, - 84A388C31B1CDD3F000166C0 /* emulator-osxTests.xctest */, + 84A388B31B1CDD3E000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename.app */, + 84A388C31B1CDD3F000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests.xctest */, ); name = Products; sourceTree = ""; }; - 84A388B51B1CDD3E000166C0 /* emulator-osx */ = { + 84A388B51B1CDD3E000166C0 /* reicast-osx */ = { isa = PBXGroup; children = ( 84A388B81B1CDD3E000166C0 /* AppDelegate.swift */, @@ -572,6 +572,7 @@ 84B7BF841B72821900F9733F /* emulator-osx-Bridging-Header.h */, 84B7BF851B72871600F9733F /* EmuGLView.swift */, ); + name = "reicast-osx"; path = "emulator-osx"; sourceTree = ""; }; @@ -583,12 +584,13 @@ name = "Supporting Files"; sourceTree = ""; }; - 84A388C61B1CDD3F000166C0 /* emulator-osxTests */ = { + 84A388C61B1CDD3F000166C0 /* reicast-osxTests */ = { isa = PBXGroup; children = ( 84A388C91B1CDD3F000166C0 /* emulator_osxTests.swift */, 84A388C71B1CDD3F000166C0 /* Supporting Files */, ); + name = "reicast-osxTests"; path = "emulator-osxTests"; sourceTree = ""; }; @@ -1244,9 +1246,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 84A388B21B1CDD3E000166C0 /* emulator-osx */ = { + 84A388B21B1CDD3E000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename */ = { isa = PBXNativeTarget; - buildConfigurationList = 84A388CD1B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "emulator-osx" */; + buildConfigurationList = 84A388CD1B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename" */; buildPhases = ( 84A388AF1B1CDD3E000166C0 /* Sources */, 84A388B01B1CDD3E000166C0 /* Frameworks */, @@ -1256,14 +1258,14 @@ ); dependencies = ( ); - name = "emulator-osx"; - productName = "emulator-osx"; - productReference = 84A388B31B1CDD3E000166C0 /* emulator-osx.app */; + name = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename"; + productName = "reicast-osx"; + productReference = 84A388B31B1CDD3E000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename.app */; productType = "com.apple.product-type.application"; }; - 84A388C21B1CDD3F000166C0 /* emulator-osxTests */ = { + 84A388C21B1CDD3F000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 84A388D01B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "emulator-osxTests" */; + buildConfigurationList = 84A388D01B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests" */; buildPhases = ( 84A388BF1B1CDD3F000166C0 /* Sources */, 84A388C01B1CDD3F000166C0 /* Frameworks */, @@ -1274,9 +1276,9 @@ dependencies = ( 84A388C51B1CDD3F000166C0 /* PBXTargetDependency */, ); - name = "emulator-osxTests"; - productName = "emulator-osxTests"; - productReference = 84A388C31B1CDD3F000166C0 /* emulator-osxTests.xctest */; + name = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests"; + productName = "reicast-osxTests"; + productReference = 84A388C31B1CDD3F000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -1297,7 +1299,7 @@ }; }; }; - buildConfigurationList = 84A388AE1B1CDD3E000166C0 /* Build configuration list for PBXProject "emulator-osx" */; + buildConfigurationList = 84A388AE1B1CDD3E000166C0 /* Build configuration list for PBXProject "reicast-osx" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -1310,8 +1312,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 84A388B21B1CDD3E000166C0 /* emulator-osx */, - 84A388C21B1CDD3F000166C0 /* emulator-osxTests */, + 84A388B21B1CDD3E000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename */, + 84A388C21B1CDD3F000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests */, ); }; /* End PBXProject section */ @@ -1534,7 +1536,7 @@ /* Begin PBXTargetDependency section */ 84A388C51B1CDD3F000166C0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 84A388B21B1CDD3E000166C0 /* emulator-osx */; + target = 84A388B21B1CDD3E000166C0 /* reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename */; targetProxy = 84A388C41B1CDD3F000166C0 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1651,7 +1653,7 @@ ); INFOPLIST_FILE = "emulator-osx/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename"; SWIFT_OBJC_BRIDGING_HEADER = "emulator-osx/emulator-osx-Bridging-Header.h"; }; name = Debug; @@ -1679,7 +1681,7 @@ ); INFOPLIST_FILE = "emulator-osx/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename"; SWIFT_OBJC_BRIDGING_HEADER = "emulator-osx/emulator-osx-Bridging-Header.h"; }; name = Release; @@ -1699,8 +1701,8 @@ ); INFOPLIST_FILE = "emulator-osxTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/emulator-osx.app/Contents/MacOS/emulator-osx"; + PRODUCT_NAME = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/reicast-osx.app/Contents/MacOS/reicast-osx"; }; name = Debug; }; @@ -1715,15 +1717,15 @@ ); INFOPLIST_FILE = "emulator-osxTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/emulator-osx.app/Contents/MacOS/emulator-osx"; + PRODUCT_NAME = "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/reicast-osx.app/Contents/MacOS/reicast-osx"; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 84A388AE1B1CDD3E000166C0 /* Build configuration list for PBXProject "emulator-osx" */ = { + 84A388AE1B1CDD3E000166C0 /* Build configuration list for PBXProject "reicast-osx" */ = { isa = XCConfigurationList; buildConfigurations = ( 84A388CB1B1CDD3F000166C0 /* Debug */, @@ -1732,7 +1734,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 84A388CD1B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "emulator-osx" */ = { + 84A388CD1B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_rename" */ = { isa = XCConfigurationList; buildConfigurations = ( 84A388CE1B1CDD3F000166C0 /* Debug */, @@ -1741,7 +1743,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 84A388D01B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "emulator-osxTests" */ = { + 84A388D01B1CDD3F000166C0 /* Build configuration list for PBXNativeTarget "reicast-osx.temp_caseinsensitive_rename.temp_caseinsensitive_renameTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 84A388D11B1CDD3F000166C0 /* Debug */, diff --git a/shell/apple/reicast.xcworkspace/contents.xcworkspacedata b/shell/apple/reicast.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..9768cadb8 --- /dev/null +++ b/shell/apple/reicast.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/shell/apple/reicast.xcworkspace/xcshareddata/reicast-ios.xccheckout b/shell/apple/reicast.xcworkspace/xcshareddata/reicast-ios.xccheckout new file mode 100644 index 000000000..3e4de698e --- /dev/null +++ b/shell/apple/reicast.xcworkspace/xcshareddata/reicast-ios.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 153E213C-241E-4F02-8A4F-A1601A5610B6 + IDESourceControlProjectName + reicast-ios + IDESourceControlProjectOriginsDictionary + + BA170A7EFF7E25B0BD97DB6DB173D1CFB4CE3BD6 + https://github.com/reicast/reicast-emulator.git + + IDESourceControlProjectPath + shell/apple/emulator-ios/reicast-ios.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + BA170A7EFF7E25B0BD97DB6DB173D1CFB4CE3BD6 + ../../../../.. + + IDESourceControlProjectURL + https://github.com/reicast/reicast-emulator.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + BA170A7EFF7E25B0BD97DB6DB173D1CFB4CE3BD6 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + BA170A7EFF7E25B0BD97DB6DB173D1CFB4CE3BD6 + IDESourceControlWCCName + reicast-emulator + + + +