Merge branch 'melonDS_0.9' into develop
# Conflicts: # Delta/Base.lproj/Settings.storyboard
This commit is contained in:
Riley Testut
commit
ffb6d7b02a
@ -1 +1 @@
|
||||
Subproject commit 212cb618d7e3b90fd978c52c84e9c8c233982e37
|
||||
Subproject commit 7f8869a1839b4fea415b8db4301a7898368ed3b9
|
||||
@ -1 +1 @@
|
||||
Subproject commit 677d1e35da42855c29afa7c92882eeb051372d94
|
||||
Subproject commit cfa1866b4caee98dbd097dfddcf29210bc57846e
|
||||
@ -1776,7 +1776,7 @@ Delta uses OpenVGDB to provide automatic artwork for imported games.</mutableStr
|
||||
</tableViewCell>
|
||||
</cells>
|
||||
</tableViewSection>
|
||||
<tableViewSection headerTitle="BIOS Files" footerTitle="Delta requires these BIOS files in order to play Nintendo DS games. Tap one to import it from Files." id="ObZ-cl-5sV">
|
||||
<tableViewSection headerTitle="DS BIOS Files" footerTitle="Delta requires these BIOS files in order to play Nintendo DS games. Tap one to import it from Files." id="ObZ-cl-5sV">
|
||||
<cells>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="gray" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="Cell" textLabel="Bfp-iA-wWE" detailTextLabel="Xpe-sd-GRy" style="IBUITableViewCellStyleValue1" id="ian-1X-SOi">
|
||||
<rect key="frame" x="0.0" y="299" width="375" height="44"/>
|
||||
@ -1849,10 +1849,106 @@ Delta uses OpenVGDB to provide automatic artwork for imported games.</mutableStr
|
||||
</tableViewCell>
|
||||
</cells>
|
||||
</tableViewSection>
|
||||
<tableViewSection headerTitle="DSi BIOS Files" footerTitle="Delta requires these BIOS files in order to play Nintendo DSi games. Tap one to import it from Files." id="SAz-hG-O4G">
|
||||
<cells>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="gray" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="Cell" textLabel="QKd-rm-101" detailTextLabel="pJb-OR-TGs" style="IBUITableViewCellStyleValue1" id="jwN-8n-xgM">
|
||||
<rect key="frame" x="0.0" y="522.5" width="375" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jwN-8n-xgM" id="b29-V1-qt3">
|
||||
<rect key="frame" x="0.0" y="0.0" width="348" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="dsibios7.bin" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QKd-rm-101">
|
||||
<rect key="frame" x="16" y="12" width="89.5" height="20.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Required" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pJb-OR-TGs">
|
||||
<rect key="frame" x="272" y="12" width="68" height="20.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<color key="textColor" systemColor="systemRedColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
</tableViewCellContentView>
|
||||
</tableViewCell>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="gray" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="Cell" textLabel="6OX-32-izR" detailTextLabel="2bc-8r-epB" style="IBUITableViewCellStyleValue1" id="3ka-mn-QqR">
|
||||
<rect key="frame" x="0.0" y="566.5" width="375" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3ka-mn-QqR" id="4ya-QS-s5w">
|
||||
<rect key="frame" x="0.0" y="0.0" width="348" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="dsibios9.bin" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6OX-32-izR">
|
||||
<rect key="frame" x="16" y="12" width="92" height="20.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Required" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2bc-8r-epB">
|
||||
<rect key="frame" x="272" y="12" width="68" height="20.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<color key="textColor" systemColor="systemRedColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
</tableViewCellContentView>
|
||||
</tableViewCell>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="gray" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="Cell" textLabel="Czu-qN-Luq" detailTextLabel="eVw-7r-BEf" style="IBUITableViewCellStyleValue1" id="4FF-9a-jq2">
|
||||
<rect key="frame" x="0.0" y="610.5" width="375" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4FF-9a-jq2" id="emb-d3-TgY">
|
||||
<rect key="frame" x="0.0" y="0.0" width="348" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="dsifirmware.bin" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Czu-qN-Luq">
|
||||
<rect key="frame" x="16" y="12" width="116.5" height="20.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Required" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="eVw-7r-BEf">
|
||||
<rect key="frame" x="272" y="12" width="68" height="20.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<color key="textColor" systemColor="systemRedColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
</tableViewCellContentView>
|
||||
</tableViewCell>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="gray" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="Cell" textLabel="VWi-nu-uMv" detailTextLabel="8JD-uT-eoA" style="IBUITableViewCellStyleValue1" id="we3-0h-uKq">
|
||||
<rect key="frame" x="0.0" y="654.5" width="375" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="we3-0h-uKq" id="cG1-a2-Nez">
|
||||
<rect key="frame" x="0.0" y="0.0" width="348" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="dsinand.bin" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VWi-nu-uMv">
|
||||
<rect key="frame" x="16" y="12" width="88.5" height="20.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Required" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8JD-uT-eoA">
|
||||
<rect key="frame" x="272" y="12" width="68" height="20.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<color key="textColor" systemColor="systemRedColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
</tableViewCellContentView>
|
||||
</tableViewCell>
|
||||
</cells>
|
||||
</tableViewSection>
|
||||
<tableViewSection headerTitle="" footerTitle="Changing cores may improve performance at the cost of additional features." id="hbM-mL-bIr">
|
||||
<cells>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="gray" indentationWidth="10" reuseIdentifier="ChangeCell" textLabel="Jmx-Jw-278" style="IBUITableViewCellStyleDefault" id="p1T-4d-fC3">
|
||||
<rect key="frame" x="0.0" y="506.5" width="375" height="44"/>
|
||||
<rect key="frame" x="0.0" y="774" width="375" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="p1T-4d-fC3" id="3bs-Bp-nd4">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
|
||||
@ -1897,33 +1993,6 @@ Delta uses OpenVGDB to provide automatic artwork for imported games.</mutableStr
|
||||
<systemColor name="groupTableViewBackgroundColor">
|
||||
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</systemColor>
|
||||
<systemColor name="groupTableViewBackgroundColor">
|
||||
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</systemColor>
|
||||
<systemColor name="groupTableViewBackgroundColor">
|
||||
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</systemColor>
|
||||
<systemColor name="groupTableViewBackgroundColor">
|
||||
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</systemColor>
|
||||
<systemColor name="groupTableViewBackgroundColor">
|
||||
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</systemColor>
|
||||
<systemColor name="groupTableViewBackgroundColor">
|
||||
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</systemColor>
|
||||
<systemColor name="groupTableViewBackgroundColor">
|
||||
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</systemColor>
|
||||
<systemColor name="groupTableViewBackgroundColor">
|
||||
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</systemColor>
|
||||
<systemColor name="groupTableViewBackgroundColor">
|
||||
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</systemColor>
|
||||
<systemColor name="groupTableViewBackgroundColor">
|
||||
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</systemColor>
|
||||
<systemColor name="secondaryLabelColor">
|
||||
<color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</systemColor>
|
||||
|
||||
@ -111,42 +111,58 @@ extension DatabaseManager
|
||||
switch system
|
||||
{
|
||||
case .ds where core == MelonDS.core:
|
||||
let predicate = NSPredicate(format: "%K == %@", #keyPath(Game.identifier), Game.melonDSBIOSIdentifier)
|
||||
if let _ = Game.instancesWithPredicate(predicate, inManagedObjectContext: context, type: Game.self).first
|
||||
|
||||
// Returns nil if game already exists.
|
||||
func makeBIOS(name: String, identifier: String) -> Game?
|
||||
{
|
||||
// Game already exists, so don't do anything.
|
||||
break
|
||||
let predicate = NSPredicate(format: "%K == %@", #keyPath(Game.identifier), identifier)
|
||||
if let _ = Game.instancesWithPredicate(predicate, inManagedObjectContext: context, type: Game.self).first
|
||||
{
|
||||
// BIOS already exists, so don't do anything.
|
||||
return nil
|
||||
}
|
||||
|
||||
let bios = Game(context: context)
|
||||
bios.name = name
|
||||
bios.identifier = identifier
|
||||
bios.type = .ds
|
||||
bios.filename = "melonDS-BIOS"
|
||||
|
||||
if let sourceURL = Bundle.main.url(forResource: "DS", withExtension: "png")
|
||||
{
|
||||
do
|
||||
{
|
||||
let destinationURL = DatabaseManager.artworkURL(for: bios)
|
||||
try FileManager.default.copyItem(at: sourceURL, to: destinationURL, shouldReplace: true)
|
||||
bios.artworkURL = destinationURL
|
||||
}
|
||||
catch
|
||||
{
|
||||
print("Failed to copy default DS home screen artwork.", error)
|
||||
}
|
||||
}
|
||||
|
||||
return bios
|
||||
}
|
||||
|
||||
let game = Game(context: context)
|
||||
game.identifier = Game.melonDSBIOSIdentifier
|
||||
game.type = .ds
|
||||
game.filename = "melonDS-BIOS"
|
||||
let insertedGames = [
|
||||
(name: NSLocalizedString("Home Screen", comment: ""), identifier: Game.melonDSBIOSIdentifier),
|
||||
(name: NSLocalizedString("Home Screen (DSi)", comment: ""), identifier: Game.melonDSDSiBIOSIdentifier)
|
||||
].compactMap(makeBIOS)
|
||||
|
||||
game.name = NSLocalizedString("Home Screen", comment: "")
|
||||
|
||||
if let sourceURL = Bundle.main.url(forResource: "DS", withExtension: "png")
|
||||
{
|
||||
do
|
||||
{
|
||||
let destinationURL = DatabaseManager.artworkURL(for: game)
|
||||
try FileManager.default.copyItem(at: sourceURL, to: destinationURL, shouldReplace: true)
|
||||
game.artworkURL = destinationURL
|
||||
}
|
||||
catch
|
||||
{
|
||||
print("Failed to copy default DS home screen artwork.", error)
|
||||
}
|
||||
}
|
||||
// Break if we didn't create any new Games.
|
||||
guard !insertedGames.isEmpty else { break }
|
||||
|
||||
let gameCollection = GameCollection(context: context)
|
||||
gameCollection.identifier = GameType.ds.rawValue
|
||||
gameCollection.index = Int16(System.ds.year)
|
||||
gameCollection.games.insert(game)
|
||||
gameCollection.games.formUnion(insertedGames)
|
||||
|
||||
case .ds:
|
||||
let predicate = NSPredicate(format: "%K == %@", #keyPath(Game.identifier), Game.melonDSBIOSIdentifier)
|
||||
if let game = Game.instancesWithPredicate(predicate, inManagedObjectContext: context, type: Game.self).first
|
||||
let predicate = NSPredicate(format: "%K IN %@", #keyPath(Game.identifier), [Game.melonDSBIOSIdentifier, Game.melonDSDSiBIOSIdentifier])
|
||||
|
||||
let games = Game.instancesWithPredicate(predicate, inManagedObjectContext: context, type: Game.self)
|
||||
for game in games
|
||||
{
|
||||
context.delete(game)
|
||||
}
|
||||
|
||||
@ -14,6 +14,7 @@ import Harmony
|
||||
public extension Game
|
||||
{
|
||||
static let melonDSBIOSIdentifier = "com.rileytestut.MelonDSDeltaCore.BIOS"
|
||||
static let melonDSDSiBIOSIdentifier = "com.rileytestut.MelonDSDeltaCore.DSiBIOS"
|
||||
}
|
||||
|
||||
@objc(Game)
|
||||
@ -158,6 +159,6 @@ extension Game: Syncable
|
||||
}
|
||||
|
||||
public var isSyncingEnabled: Bool {
|
||||
return self.identifier != Game.melonDSBIOSIdentifier
|
||||
return self.identifier != Game.melonDSBIOSIdentifier && self.identifier != Game.melonDSDSiBIOSIdentifier
|
||||
}
|
||||
}
|
||||
|
||||
@ -62,6 +62,6 @@ extension GameSave: Syncable
|
||||
// self.game may be nil if being downloaded, so don't enforce it.
|
||||
// guard let identifier = self.game?.identifier else { return false }
|
||||
|
||||
return self.game?.identifier != Game.melonDSBIOSIdentifier
|
||||
return self.game?.identifier != Game.melonDSBIOSIdentifier && self.game?.identifier != Game.melonDSDSiBIOSIdentifier
|
||||
}
|
||||
}
|
||||
|
||||
@ -128,7 +128,7 @@ extension SaveState: Syncable
|
||||
// self.game may be nil if being downloaded, so don't enforce it.
|
||||
// guard let identifier = self.game?.identifier else { return false }
|
||||
|
||||
let isSyncingEnabled = (self.type != .auto && self.type != .quick) && (self.game?.identifier != Game.melonDSBIOSIdentifier)
|
||||
let isSyncingEnabled = (self.type != .auto && self.type != .quick) && (self.game?.identifier != Game.melonDSBIOSIdentifier && self.game?.identifier != Game.melonDSDSiBIOSIdentifier)
|
||||
return isSyncingEnabled
|
||||
}
|
||||
|
||||
|
||||
@ -16,4 +16,12 @@ extension UIDevice
|
||||
// https://developer.apple.com/documentation/arkit/arconfiguration/2923553-issupported
|
||||
return ARConfiguration.isSupported
|
||||
}
|
||||
|
||||
var supportsJIT: Bool {
|
||||
guard #available(iOS 14.2, *) else { return false }
|
||||
|
||||
// JIT is supported on devices with an A12 processor or better running iOS 14.2 or later.
|
||||
// ARKit 3 is only supported by devices with an A12 processor or better, according to the documentation.
|
||||
return ARBodyTrackingConfiguration.isSupported
|
||||
}
|
||||
}
|
||||
|
||||
@ -167,6 +167,22 @@ extension GameCollectionViewController
|
||||
|
||||
destinationViewController.game = game
|
||||
|
||||
if let emulatorBridge = destinationViewController.emulatorCore?.deltaCore.emulatorBridge as? MelonDSEmulatorBridge
|
||||
{
|
||||
//TODO: Update this to work with multiple processes by retrieving emulatorBridge directly from emulatorCore.
|
||||
|
||||
if game.identifier == Game.melonDSDSiBIOSIdentifier
|
||||
{
|
||||
emulatorBridge.systemType = .dsi
|
||||
}
|
||||
else
|
||||
{
|
||||
emulatorBridge.systemType = .ds
|
||||
}
|
||||
|
||||
emulatorBridge.isJITEnabled = UIDevice.current.supportsJIT
|
||||
}
|
||||
|
||||
if let saveState = self.activeSaveState
|
||||
{
|
||||
// Must be synchronous or else there will be a flash of black
|
||||
@ -395,11 +411,23 @@ private extension GameCollectionViewController
|
||||
|
||||
if game.type == .ds && Settings.preferredCore(for: .ds) == MelonDS.core
|
||||
{
|
||||
guard
|
||||
FileManager.default.fileExists(atPath: MelonDSEmulatorBridge.shared.bios7URL.path) &&
|
||||
FileManager.default.fileExists(atPath: MelonDSEmulatorBridge.shared.bios9URL.path) &&
|
||||
FileManager.default.fileExists(atPath: MelonDSEmulatorBridge.shared.firmwareURL.path)
|
||||
else { throw LaunchError.biosNotFound }
|
||||
if game.identifier == Game.melonDSDSiBIOSIdentifier
|
||||
{
|
||||
guard
|
||||
FileManager.default.fileExists(atPath: MelonDSEmulatorBridge.shared.dsiBIOS7URL.path) &&
|
||||
FileManager.default.fileExists(atPath: MelonDSEmulatorBridge.shared.dsiBIOS9URL.path) &&
|
||||
FileManager.default.fileExists(atPath: MelonDSEmulatorBridge.shared.dsiFirmwareURL.path) &&
|
||||
FileManager.default.fileExists(atPath: MelonDSEmulatorBridge.shared.dsiNANDURL.path)
|
||||
else { throw LaunchError.biosNotFound }
|
||||
}
|
||||
else
|
||||
{
|
||||
guard
|
||||
FileManager.default.fileExists(atPath: MelonDSEmulatorBridge.shared.bios7URL.path) &&
|
||||
FileManager.default.fileExists(atPath: MelonDSEmulatorBridge.shared.bios9URL.path) &&
|
||||
FileManager.default.fileExists(atPath: MelonDSEmulatorBridge.shared.firmwareURL.path)
|
||||
else { throw LaunchError.biosNotFound }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -445,9 +473,12 @@ private extension GameCollectionViewController
|
||||
|
||||
switch game.type
|
||||
{
|
||||
case GameType.unknown: return [cancelAction, renameAction, changeArtworkAction, shareAction, deleteAction]
|
||||
case .ds where game.identifier == Game.melonDSBIOSIdentifier: return [cancelAction, renameAction, changeArtworkAction, changeControllerSkinAction, saveStatesAction]
|
||||
default: return [cancelAction, renameAction, changeArtworkAction, changeControllerSkinAction, shareAction, saveStatesAction, importSaveFile, exportSaveFile, deleteAction]
|
||||
case GameType.unknown:
|
||||
return [cancelAction, renameAction, changeArtworkAction, shareAction, deleteAction]
|
||||
case .ds where game.identifier == Game.melonDSBIOSIdentifier || game.identifier == Game.melonDSDSiBIOSIdentifier:
|
||||
return [cancelAction, renameAction, changeArtworkAction, changeControllerSkinAction, saveStatesAction]
|
||||
default:
|
||||
return [cancelAction, renameAction, changeArtworkAction, changeControllerSkinAction, shareAction, saveStatesAction, importSaveFile, exportSaveFile, deleteAction]
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -22,11 +22,12 @@ private extension MelonDSCoreSettingsViewController
|
||||
enum Section: Int
|
||||
{
|
||||
case general
|
||||
case bios
|
||||
case dsBIOS
|
||||
case dsiBIOS
|
||||
case changeCore
|
||||
}
|
||||
|
||||
enum BIOS: Int
|
||||
enum DSBIOS: Int
|
||||
{
|
||||
case bios7
|
||||
case bios9
|
||||
@ -41,6 +42,24 @@ private extension MelonDSCoreSettingsViewController
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
enum DSiBIOS: Int
|
||||
{
|
||||
case bios7
|
||||
case bios9
|
||||
case firmware
|
||||
case nand
|
||||
|
||||
var fileURL: URL {
|
||||
switch self
|
||||
{
|
||||
case .bios7: return MelonDSEmulatorBridge.shared.dsiBIOS7URL
|
||||
case .bios9: return MelonDSEmulatorBridge.shared.dsiBIOS9URL
|
||||
case .firmware: return MelonDSEmulatorBridge.shared.dsiFirmwareURL
|
||||
case .nand: return MelonDSEmulatorBridge.shared.dsiNANDURL
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class MelonDSCoreSettingsViewController: UITableViewController
|
||||
@ -102,9 +121,9 @@ private extension MelonDSCoreSettingsViewController
|
||||
self.present(safariViewController, animated: true, completion: nil)
|
||||
}
|
||||
|
||||
func locate(_ bios: BIOS)
|
||||
func locateBIOS(for destinationURL: URL)
|
||||
{
|
||||
self.importDestinationURL = bios.fileURL
|
||||
self.importDestinationURL = destinationURL
|
||||
|
||||
var supportedTypes = [kUTTypeItem as String, kUTTypeContent as String, "com.apple.macbinary-archive" /* System UTI for .bin */]
|
||||
|
||||
@ -200,8 +219,26 @@ extension MelonDSCoreSettingsViewController
|
||||
|
||||
cell.contentView.isHidden = (item == nil)
|
||||
|
||||
case .bios:
|
||||
let bios = BIOS(rawValue: indexPath.row)!
|
||||
case .dsBIOS:
|
||||
let bios = DSBIOS(rawValue: indexPath.row)!
|
||||
|
||||
if FileManager.default.fileExists(atPath: bios.fileURL.path)
|
||||
{
|
||||
cell.accessoryType = .checkmark
|
||||
cell.detailTextLabel?.text = nil
|
||||
cell.detailTextLabel?.textColor = .gray
|
||||
}
|
||||
else
|
||||
{
|
||||
cell.accessoryType = .disclosureIndicator
|
||||
cell.detailTextLabel?.text = NSLocalizedString("Required", comment: "")
|
||||
cell.detailTextLabel?.textColor = .red
|
||||
}
|
||||
|
||||
cell.selectionStyle = .default
|
||||
|
||||
case .dsiBIOS:
|
||||
let bios = DSiBIOS(rawValue: indexPath.row)!
|
||||
|
||||
if FileManager.default.fileExists(atPath: bios.fileURL.path)
|
||||
{
|
||||
@ -250,9 +287,13 @@ extension MelonDSCoreSettingsViewController
|
||||
let key = DeltaCoreMetadata.Key.allCases[indexPath.row]
|
||||
self.openMetadataURL(for: key)
|
||||
|
||||
case .bios:
|
||||
let bios = BIOS(rawValue: indexPath.row)!
|
||||
self.locate(bios)
|
||||
case .dsBIOS:
|
||||
let bios = DSBIOS(rawValue: indexPath.row)!
|
||||
self.locateBIOS(for: bios.fileURL)
|
||||
|
||||
case .dsiBIOS:
|
||||
let bios = DSiBIOS(rawValue: indexPath.row)!
|
||||
self.locateBIOS(for: bios.fileURL)
|
||||
|
||||
case .changeCore:
|
||||
self.changeCore()
|
||||
@ -263,7 +304,7 @@ extension MelonDSCoreSettingsViewController
|
||||
{
|
||||
switch Section(rawValue: section)!
|
||||
{
|
||||
case .bios:
|
||||
case .dsBIOS, .dsiBIOS:
|
||||
guard Settings.preferredCore(for: .ds) == MelonDS.core else { return nil }
|
||||
|
||||
default: break
|
||||
@ -276,7 +317,7 @@ extension MelonDSCoreSettingsViewController
|
||||
{
|
||||
switch Section(rawValue: section)!
|
||||
{
|
||||
case .bios:
|
||||
case .dsBIOS, .dsiBIOS:
|
||||
guard Settings.preferredCore(for: .ds) == MelonDS.core else { return nil }
|
||||
|
||||
default: break
|
||||
@ -293,7 +334,7 @@ extension MelonDSCoreSettingsViewController
|
||||
let key = DeltaCoreMetadata.Key.allCases[indexPath.row]
|
||||
guard Settings.preferredCore(for: .ds)?.metadata?[key] != nil else { return 0 }
|
||||
|
||||
case .bios:
|
||||
case .dsBIOS, .dsiBIOS:
|
||||
guard Settings.preferredCore(for: .ds) == MelonDS.core else { return 0 }
|
||||
|
||||
default: break
|
||||
@ -306,7 +347,7 @@ extension MelonDSCoreSettingsViewController
|
||||
{
|
||||
switch Section(rawValue: section)!
|
||||
{
|
||||
case .bios:
|
||||
case .dsBIOS, .dsiBIOS:
|
||||
guard Settings.preferredCore(for: .ds) == MelonDS.core else { return 1 }
|
||||
|
||||
default: break
|
||||
@ -319,7 +360,7 @@ extension MelonDSCoreSettingsViewController
|
||||
{
|
||||
switch Section(rawValue: section)!
|
||||
{
|
||||
case .bios:
|
||||
case .dsBIOS, .dsiBIOS:
|
||||
guard Settings.preferredCore(for: .ds) == MelonDS.core else { return 1 }
|
||||
|
||||
default: break
|
||||
|
||||
@ -185,6 +185,8 @@
|
||||
<true/>
|
||||
<key>LSSupportsOpeningDocumentsInPlace</key>
|
||||
<false/>
|
||||
<key>NSMicrophoneUsageDescription</key>
|
||||
<string>Delta uses your microphone to emulate the Nintendo DS microphone.</string>
|
||||
<key>NSPhotoLibraryUsageDescription</key>
|
||||
<string>Press "OK" to allow Delta to use images from your Photo Library as game artwork.</string>
|
||||
<key>UIBackgroundModes</key>
|
||||
|
||||
@ -127,7 +127,7 @@ EXTERNAL SOURCES:
|
||||
SPEC CHECKSUMS:
|
||||
Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
|
||||
Crashlytics: e156f27e43abaa331f9b7afed091bda37e1052cc
|
||||
DeltaCore: 1b246a4e436c6b2b377ea84a1bc847a1c5f4b6cd
|
||||
DeltaCore: be1ed931bf8dba0bd1d9f85310dcc99eeae10517
|
||||
DSDeltaCore: 7dc6a18e25d8036a5022a34c1ffb4062af9eed3d
|
||||
Fabric: be0459577cee96fe21f68de24588be2dd71482b8
|
||||
GBADeltaCore: 10ff8fde89ed95c99888a9b7102b3d3e45d7458d
|
||||
@ -137,7 +137,7 @@ SPEC CHECKSUMS:
|
||||
GoogleToolboxForMac: 800648f8b3127618c1b59c7f97684427630c5ea3
|
||||
GTMSessionFetcher: cea130bbfe5a7edc8d06d3f0d17288c32ffe9925
|
||||
Harmony: cea514db17c41c22f78f54b17d2135935b5e9b96
|
||||
MelonDSDeltaCore: d6e0953bd475a17848964b4fc48bf0e838617984
|
||||
MelonDSDeltaCore: 7d5cae0d00ee823a5957acd844e1de1501e7a6a5
|
||||
N64DeltaCore: 7d176e01443fa138bdfc79ad908c78f271f3e0a7
|
||||
NESDeltaCore: 41ab438dd78d51d4636aacb7d9a7336ea3d4728c
|
||||
Roxas: 1990039f843f5dc284918dc82375feb80020ef62
|
||||
|
||||
1
Pods/Headers/Private/DeltaCore/DLTAMuteSwitchMonitor.h
generated
Symbolic link
1
Pods/Headers/Private/DeltaCore/DLTAMuteSwitchMonitor.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../Cores/DeltaCore/DeltaCore/Emulator Core/Audio/DLTAMuteSwitchMonitor.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARCodeFile.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARCodeFile.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/ARCodeFile.h
|
||||
@ -1 +0,0 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/ARCodeList.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARMJIT.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARMJIT.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/ARMJIT.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARMJIT_A64/ARMJIT_Compiler.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARMJIT_A64/ARMJIT_Compiler.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../../Cores/MelonDSDeltaCore/melonDS/src/ARMJIT_A64/ARMJIT_Compiler.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARMJIT_Compiler.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARMJIT_Compiler.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/ARMJIT_Compiler.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARMJIT_Internal.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARMJIT_Internal.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/ARMJIT_Internal.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARMJIT_Memory.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARMJIT_Memory.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/ARMJIT_Memory.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARMJIT_RegisterCache.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARMJIT_RegisterCache.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/ARMJIT_RegisterCache.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARM_InstrInfo.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ARM_InstrInfo.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/ARM_InstrInfo.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/DSi.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSiCrypto.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSiCrypto.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/DSiCrypto.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_AES.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_AES.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/DSi_AES.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_Camera.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_Camera.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/DSi_Camera.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_I2C.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_I2C.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/DSi_I2C.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_NDMA.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_NDMA.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/DSi_NDMA.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_NWifi.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_NWifi.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/DSi_NWifi.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_SD.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_SD.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/DSi_SD.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_SPI_TSC.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/DSi_SPI_TSC.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/DSi_SPI_TSC.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/GPU_OpenGL_shaders.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/GPU_OpenGL_shaders.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/GPU_OpenGL_shaders.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ROMList.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/ROMList.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/ROMList.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/dolphin/Arm64Emitter.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/dolphin/Arm64Emitter.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../../Cores/MelonDSDeltaCore/melonDS/src/dolphin/Arm64Emitter.h
|
||||
@ -1 +0,0 @@
|
||||
../../../../../../../Cores/MelonDSDeltaCore/melonDS/src/libui_sdl/PlatformConfig.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/melonDLDI.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/melonDLDI.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../Cores/MelonDSDeltaCore/melonDS/src/melonDLDI.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/tiny-AES-c/aes.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/tiny-AES-c/aes.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../../Cores/MelonDSDeltaCore/melonDS/src/tiny-AES-c/aes.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/tiny-AES-c/aes.hpp
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/tiny-AES-c/aes.hpp
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../../Cores/MelonDSDeltaCore/melonDS/src/tiny-AES-c/aes.hpp
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/xxhash/xxh3.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/xxhash/xxh3.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../../Cores/MelonDSDeltaCore/melonDS/src/xxhash/xxh3.h
|
||||
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/xxhash/xxhash.h
generated
Symbolic link
1
Pods/Headers/Private/MelonDSDeltaCore/melonDS/src/xxhash/xxhash.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../../../../Cores/MelonDSDeltaCore/melonDS/src/xxhash/xxhash.h
|
||||
1
Pods/Headers/Public/DeltaCore/DLTAMuteSwitchMonitor.h
generated
Symbolic link
1
Pods/Headers/Public/DeltaCore/DLTAMuteSwitchMonitor.h
generated
Symbolic link
@ -0,0 +1 @@
|
||||
../../../../Cores/DeltaCore/DeltaCore/Emulator Core/Audio/DLTAMuteSwitchMonitor.h
|
||||
8
Pods/Local Podspecs/DeltaCore.podspec.json
generated
8
Pods/Local Podspecs/DeltaCore.podspec.json
generated
@ -15,7 +15,10 @@
|
||||
},
|
||||
"social_media_url": "https://twitter.com/rileytestut",
|
||||
"source_files": "DeltaCore/**/*.{h,m,swift}",
|
||||
"public_header_files": "DeltaCore/DeltaTypes.h",
|
||||
"public_header_files": [
|
||||
"DeltaCore/DeltaTypes.h",
|
||||
"DeltaCore/Emulator Core/Audio/DLTAMuteSwitchMonitor.h"
|
||||
],
|
||||
"resource_bundles": {
|
||||
"DeltaCore": [
|
||||
"DeltaCore/**/*.deltamapping"
|
||||
@ -27,7 +30,8 @@
|
||||
]
|
||||
},
|
||||
"xcconfig": {
|
||||
"SWIFT_ACTIVE_COMPILATION_CONDITIONS": "STATIC_LIBRARY"
|
||||
"SWIFT_ACTIVE_COMPILATION_CONDITIONS": "STATIC_LIBRARY",
|
||||
"OTHER_CFLAGS": "-DSTATIC_LIBRARY"
|
||||
},
|
||||
"script_phases": {
|
||||
"name": "Copy Swift Header",
|
||||
|
||||
14
Pods/Local Podspecs/MelonDSDeltaCore.podspec.json
generated
14
Pods/Local Podspecs/MelonDSDeltaCore.podspec.json
generated
@ -20,11 +20,16 @@
|
||||
"MelonDSDeltaCore/Bridge/MelonDSEmulatorBridge.{h,mm}",
|
||||
"MelonDSDeltaCore/Types/MelonDSTypes.{h,m}",
|
||||
"melonDS/src/*.{h,hpp,cpp}",
|
||||
"melonDS/src/libui_sdl/PlatformConfig.{h,cpp}"
|
||||
"melonDS/src/fontend/qt_sdl/PlatformConfig.{h,cpp}",
|
||||
"melonDS/src/tiny-AES-c/*.{h,hpp,c}",
|
||||
"melonDS/src/ARMJIT_A64/*.{h,cpp,s}",
|
||||
"melonDS/src/dolphin/Arm64Emitter.{h,cpp}",
|
||||
"melonDS/src/xxhash/*.{h,c}"
|
||||
],
|
||||
"exclude_files": [
|
||||
"melonDS/src/GPU3D_OpenGL.cpp",
|
||||
"melonDS/src/OpenGLSupport.cpp"
|
||||
"melonDS/src/OpenGLSupport.cpp",
|
||||
"melonDS/src/GPU_OpenGL.cpp"
|
||||
],
|
||||
"public_header_files": [
|
||||
"MelonDSDeltaCore/Types/MelonDSTypes.h",
|
||||
@ -35,8 +40,7 @@
|
||||
"resource_bundles": {
|
||||
"melonDS": [
|
||||
"MelonDSDeltaCore/**/*.deltamapping",
|
||||
"MelonDSDeltaCore/**/*.deltaskin",
|
||||
"melonDS/romlist.bin"
|
||||
"MelonDSDeltaCore/**/*.deltaskin"
|
||||
]
|
||||
},
|
||||
"dependencies": {
|
||||
@ -47,7 +51,7 @@
|
||||
"xcconfig": {
|
||||
"HEADER_SEARCH_PATHS": "\"${PODS_CONFIGURATION_BUILD_DIR}\" \"$(PODS_ROOT)/Headers/Private/MelonDSDeltaCore/melonDS/src\"",
|
||||
"USER_HEADER_SEARCH_PATHS": "\"${PODS_CONFIGURATION_BUILD_DIR}/DeltaCore/Swift Compatibility Header\"",
|
||||
"GCC_PREPROCESSOR_DEFINITIONS": "STATIC_LIBRARY=1",
|
||||
"GCC_PREPROCESSOR_DEFINITIONS": "STATIC_LIBRARY=1 JIT_ENABLED=1",
|
||||
"GCC_OPTIMIZATION_LEVEL": "fast"
|
||||
}
|
||||
}
|
||||
|
||||
4
Pods/Manifest.lock
generated
4
Pods/Manifest.lock
generated
@ -127,7 +127,7 @@ EXTERNAL SOURCES:
|
||||
SPEC CHECKSUMS:
|
||||
Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
|
||||
Crashlytics: e156f27e43abaa331f9b7afed091bda37e1052cc
|
||||
DeltaCore: 1b246a4e436c6b2b377ea84a1bc847a1c5f4b6cd
|
||||
DeltaCore: be1ed931bf8dba0bd1d9f85310dcc99eeae10517
|
||||
DSDeltaCore: 7dc6a18e25d8036a5022a34c1ffb4062af9eed3d
|
||||
Fabric: be0459577cee96fe21f68de24588be2dd71482b8
|
||||
GBADeltaCore: 10ff8fde89ed95c99888a9b7102b3d3e45d7458d
|
||||
@ -137,7 +137,7 @@ SPEC CHECKSUMS:
|
||||
GoogleToolboxForMac: 800648f8b3127618c1b59c7f97684427630c5ea3
|
||||
GTMSessionFetcher: cea130bbfe5a7edc8d06d3f0d17288c32ffe9925
|
||||
Harmony: cea514db17c41c22f78f54b17d2135935b5e9b96
|
||||
MelonDSDeltaCore: d6e0953bd475a17848964b4fc48bf0e838617984
|
||||
MelonDSDeltaCore: 7d5cae0d00ee823a5957acd844e1de1501e7a6a5
|
||||
N64DeltaCore: 7d176e01443fa138bdfc79ad908c78f271f3e0a7
|
||||
NESDeltaCore: 41ab438dd78d51d4636aacb7d9a7336ea3d4728c
|
||||
Roxas: 1990039f843f5dc284918dc82375feb80020ef62
|
||||
|
||||
1436
Pods/Pods.xcodeproj/project.pbxproj
generated
1436
Pods/Pods.xcodeproj/project.pbxproj
generated
File diff suppressed because it is too large
Load Diff
@ -11,6 +11,7 @@
|
||||
#endif
|
||||
|
||||
#import "DeltaTypes.h"
|
||||
#import "DLTAMuteSwitchMonitor.h"
|
||||
|
||||
FOUNDATION_EXPORT double DeltaCoreVersionNumber;
|
||||
FOUNDATION_EXPORT const unsigned char DeltaCoreVersionString[];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/DeltaCore
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
||||
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/DeltaCore" "${PODS_ROOT}/Headers/Public"
|
||||
OTHER_CFLAGS = $(inherited) -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap"
|
||||
OTHER_CFLAGS = $(inherited) -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap" -DSTATIC_LIBRARY
|
||||
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap" -suppress-warnings -import-underlying-module -Xcc -fmodule-map-file="${SRCROOT}/${MODULEMAP_FILE}"
|
||||
PODS_BUILD_DIR = ${BUILD_DIR}
|
||||
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore
|
||||
GCC_OPTIMIZATION_LEVEL = fast
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 STATIC_LIBRARY=1
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 STATIC_LIBRARY=1 JIT_ENABLED=1
|
||||
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/MelonDSDeltaCore" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/MelonDSDeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}" "$(PODS_ROOT)/Headers/Private/MelonDSDeltaCore/melonDS/src"
|
||||
OTHER_CFLAGS = $(inherited) -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DeltaCore/DeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap"
|
||||
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DeltaCore/DeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap" -suppress-warnings -import-underlying-module -Xcc -fmodule-map-file="${SRCROOT}/${MODULEMAP_FILE}"
|
||||
|
||||
@ -2,10 +2,10 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
|
||||
ALWAYS_SEARCH_USER_PATHS = YES
|
||||
CLANG_ENABLE_MODULES = NO
|
||||
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Crashlytics/iOS" "${PODS_ROOT}/Fabric/iOS" "${PODS_ROOT}/GoogleSignIn/Frameworks"
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 STATIC_LIBRARY=1 STATIC_LIBRARY=1 MUPENPLUSAPI TXFILTER_LIB OS_IOS GLESX GL_ERROR_DEBUG GL_DEBUG GLESX PNG_ARM_NEON_OPT=0
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 STATIC_LIBRARY=1 JIT_ENABLED=1 STATIC_LIBRARY=1 STATIC_LIBRARY=1 MUPENPLUSAPI TXFILTER_LIB OS_IOS GLESX GL_ERROR_DEBUG GL_DEBUG GLESX PNG_ARM_NEON_OPT=0
|
||||
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DSDeltaCore" "${PODS_ROOT}/Headers/Public/DeltaCore" "${PODS_ROOT}/Headers/Public/GBADeltaCore" "${PODS_ROOT}/Headers/Public/GBCDeltaCore" "${PODS_ROOT}/Headers/Public/GTMSessionFetcher" "${PODS_ROOT}/Headers/Public/GoogleAPIClientForREST" "${PODS_ROOT}/Headers/Public/GoogleToolboxForMac" "${PODS_ROOT}/Headers/Public/Harmony" "${PODS_ROOT}/Headers/Public/MelonDSDeltaCore" "${PODS_ROOT}/Headers/Public/N64DeltaCore" "${PODS_ROOT}/Headers/Public/NESDeltaCore" "${PODS_ROOT}/Headers/Public/Roxas" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SMCalloutView" "${PODS_ROOT}/Headers/Public/SNESDeltaCore" "${PODS_ROOT}/Headers/Public/SQLite.swift" "${PODS_ROOT}/Headers/Public/SwiftyDropbox" "${PODS_CONFIGURATION_BUILD_DIR}" "$(PODS_ROOT)/Headers/Private/DSDeltaCore/desmume/desmume/src/libretro-common/include" "${PODS_CONFIGURATION_BUILD_DIR}" "$(PODS_ROOT)/Headers/Private/GBADeltaCore/SFML/include" "$(PODS_ROOT)/Headers/Private/GBADeltaCore/SFML/src" "${PODS_CONFIGURATION_BUILD_DIR}" "${PODS_CONFIGURATION_BUILD_DIR}" "$(PODS_ROOT)/Headers/Private/MelonDSDeltaCore/melonDS/src" "${PODS_CONFIGURATION_BUILD_DIR}" "$(PODS_ROOT)/Headers/Private/N64DeltaCore/Mupen64Plus/mupen64plus-core/subprojects/**" "$(PODS_ROOT)/Headers/Private/N64DeltaCore/libMupen64Plus/SDL" "${PODS_CONFIGURATION_BUILD_DIR}" "$(PODS_ROOT)/Headers/Private/N64DeltaCore/Mupen64Plus/mupen64plus-core/subprojects/**" "$(PODS_ROOT)/Headers/Private/N64DeltaCore/libMupen64Plus/SDL" "$(PODS_ROOT)/Headers/Private/N64DeltaCore/Mupen64Plus/GLideN64/src" "$(PODS_ROOT)/Headers/Private/N64DeltaCore/Mupen64Plus/GLideN64/src/inc"
|
||||
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/DSDeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/DeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/GBADeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/GBCDeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleAPIClientForREST" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleToolboxForMac" "${PODS_CONFIGURATION_BUILD_DIR}/Harmony" "${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/N64DeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/NESDeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/Roxas" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SMCalloutView" "${PODS_CONFIGURATION_BUILD_DIR}/SNESDeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyDropbox" "${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation"
|
||||
OTHER_CFLAGS = $(inherited) -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DSDeltaCore/DSDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DeltaCore/DeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/GBADeltaCore/GBADeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/GBCDeltaCore/GBCDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Harmony/Harmony.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore/MelonDSDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/N64DeltaCore/N64DeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/NESDeltaCore/NESDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SNESDeltaCore/SNESDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SwiftyDropbox/SwiftyDropbox.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/GTMSessionFetcher/GTMSessionFetcher.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/GoogleAPIClientForREST/GoogleAPIClientForREST.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/GoogleToolboxForMac/GoogleToolboxForMac.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/Roxas/Roxas.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/SDWebImage/SDWebImage.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/SMCalloutView/SMCalloutView.modulemap" -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/DSDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/GBADeltaCore" -isystem "${PODS_ROOT}/Headers/Public/GBCDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/Harmony" -isystem "${PODS_ROOT}/Headers/Public/MelonDSDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/N64DeltaCore" -isystem "${PODS_ROOT}/Headers/Public/NESDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/SNESDeltaCore" -iframework "${PODS_ROOT}/Crashlytics/iOS" -iframework "${PODS_ROOT}/Fabric/iOS" -iframework "${PODS_ROOT}/GoogleSignIn/Frameworks" -DHOST_DARWIN -DDESMUME_COCOA -DHAVE_OPENGL -DHAVE_LIBZ -DANDROID -fexceptions -ftree-vectorize -DCOMPRESS_MT -DIOS -DOBJ_C -marm -fvisibility=hidden -DHAVE_CSTDINT -fno-strict-aliasing -DGCC -pthread -fPIC -D__unix__ -ffast-math -fno-strict-aliasing -DGCC -pthread -fPIC -D__unix__ -ffast-math -D__VEC4_OPT -fvisibility=hidden -funsigned-char -ffast-math -finline -fno-builtin -fno-common -fomit-frame-pointer -funroll-loops -fstrict-aliasing -DHAVE_STDINT_H -DARM
|
||||
OTHER_CFLAGS = $(inherited) -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DSDeltaCore/DSDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DeltaCore/DeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/GBADeltaCore/GBADeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/GBCDeltaCore/GBCDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Harmony/Harmony.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore/MelonDSDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/N64DeltaCore/N64DeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/NESDeltaCore/NESDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SNESDeltaCore/SNESDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SwiftyDropbox/SwiftyDropbox.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/GTMSessionFetcher/GTMSessionFetcher.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/GoogleAPIClientForREST/GoogleAPIClientForREST.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/GoogleToolboxForMac/GoogleToolboxForMac.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/Roxas/Roxas.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/SDWebImage/SDWebImage.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/SMCalloutView/SMCalloutView.modulemap" -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/DSDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/GBADeltaCore" -isystem "${PODS_ROOT}/Headers/Public/GBCDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/Harmony" -isystem "${PODS_ROOT}/Headers/Public/MelonDSDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/N64DeltaCore" -isystem "${PODS_ROOT}/Headers/Public/NESDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/SNESDeltaCore" -iframework "${PODS_ROOT}/Crashlytics/iOS" -iframework "${PODS_ROOT}/Fabric/iOS" -iframework "${PODS_ROOT}/GoogleSignIn/Frameworks" -DHOST_DARWIN -DDESMUME_COCOA -DHAVE_OPENGL -DHAVE_LIBZ -DANDROID -fexceptions -ftree-vectorize -DCOMPRESS_MT -DIOS -DOBJ_C -marm -fvisibility=hidden -DSTATIC_LIBRARY -DHAVE_CSTDINT -fno-strict-aliasing -DGCC -pthread -fPIC -D__unix__ -ffast-math -fno-strict-aliasing -DGCC -pthread -fPIC -D__unix__ -ffast-math -D__VEC4_OPT -fvisibility=hidden -funsigned-char -ffast-math -finline -fno-builtin -fno-common -fomit-frame-pointer -funroll-loops -fstrict-aliasing -DHAVE_STDINT_H -DARM
|
||||
OTHER_LDFLAGS = $(inherited) -ObjC -Wl,-exported_symbol,_Video_PluginStartup,-exported_symbol,_Video_PluginShutdown,-exported_symbol,_Video_PluginGetVersion,-exported_symbol,_Video_RomOpen,-exported_symbol,_Video_RomClosed,-exported_symbol,_ConfigGetSharedDataFilepath,-exported_symbol,_ConfigGetUserConfigPath,-exported_symbol,_ConfigGetUserCachePath,-exported_symbol,_ConfigGetUserDataPath,-exported_symbol,_ConfigOpenSection,-exported_symbol,_ConfigDeleteSection,-exported_symbol,_ConfigSaveSection,-exported_symbol,_ConfigSaveFile,-exported_symbol,_ConfigSetDefaultInt,-exported_symbol,_ConfigSetDefaultFloat,-exported_symbol,_ConfigSetDefaultBool,-exported_symbol,_ConfigSetDefaultString,-exported_symbol,_ConfigGetParamInt,-exported_symbol,_ConfigGetParamFloat,-exported_symbol,_ConfigGetParamBool,-exported_symbol,_ConfigGetParamString,-exported_symbol,_ConfigExternalGetParameter,-exported_symbol,_ConfigExternalOpen,-exported_symbol,_ConfigExternalClose,-exported_symbol,_VidExt_Init,-exported_symbol,_VidExt_Quit,-exported_symbol,_VidExt_ListFullscreenModes,-exported_symbol,_VidExt_SetVideoMode,-exported_symbol,_VidExt_SetCaption,-exported_symbol,_VidExt_ToggleFullScreen,-exported_symbol,_VidExt_ResizeWindow,-exported_symbol,_VidExt_GL_GetProcAddress,-exported_symbol,_VidExt_GL_SetAttribute,-exported_symbol,_VidExt_GL_GetAttribute,-exported_symbol,_VidExt_GL_SwapBuffers,-exported_symbol,_ChangeWindow,-exported_symbol,_InitiateGFX,-exported_symbol,_MoveScreen,-exported_symbol,_ProcessDList,-exported_symbol,_ProcessRDPList,-exported_symbol,_ShowCFB,-exported_symbol,_UpdateScreen,-exported_symbol,_ViStatusChanged,-exported_symbol,_ViWidthChanged,-exported_symbol,_ReadScreen2,-exported_symbol,_SetRenderingCallback,-exported_symbol,_FBRead,-exported_symbol,_FBWrite,-exported_symbol,_FBGetFrameBufferInfo,-exported_symbol,_ResizeVideoOutput,-exported_symbol,_RSP_PluginStartup,-exported_symbol,_RSP_PluginShutdown,-exported_symbol,_RSP_PluginGetVersion,-exported_symbol,_DoRspCycles,-exported_symbol,_InitiateRSP,-exported_symbol,_RSP_RomClosed,-exported_symbol,_CoreGetAPIVersions,-exported_symbol,_ConfigGetParameter,-exported_symbol,_ConfigSetParameter,-exported_symbol,_CoreDoCommand -l"Alamofire" -l"DSDeltaCore" -l"DeltaCore" -l"GBADeltaCore" -l"GBCDeltaCore" -l"GTMSessionFetcher" -l"GoogleAPIClientForREST" -l"GoogleToolboxForMac" -l"Harmony" -l"MelonDSDeltaCore" -l"N64DeltaCore" -l"NESDeltaCore" -l"Roxas" -l"SDWebImage" -l"SMCalloutView" -l"SNESDeltaCore" -l"SQLite.swift" -l"SwiftyDropbox" -l"ZIPFoundation" -l"c++" -l"sqlite3" -l"z" -framework "CoreGraphics" -framework "CoreText" -framework "Crashlytics" -framework "Fabric" -framework "Foundation" -framework "GoogleSignIn" -framework "ImageIO" -framework "LocalAuthentication" -framework "SafariServices" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "WebKit"
|
||||
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DSDeltaCore/DSDeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DeltaCore/DeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/GBADeltaCore/GBADeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/GBCDeltaCore/GBCDeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Harmony/Harmony.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore/MelonDSDeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/N64DeltaCore/N64DeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/NESDeltaCore/NESDeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SNESDeltaCore/SNESDeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SwiftyDropbox/SwiftyDropbox.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/GTMSessionFetcher/GTMSessionFetcher.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/GoogleAPIClientForREST/GoogleAPIClientForREST.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/GoogleToolboxForMac/GoogleToolboxForMac.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/Roxas/Roxas.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/SDWebImage/SDWebImage.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/SMCalloutView/SMCalloutView.modulemap"
|
||||
PODS_BUILD_DIR = ${BUILD_DIR}
|
||||
|
||||
@ -2,10 +2,10 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
|
||||
ALWAYS_SEARCH_USER_PATHS = YES
|
||||
CLANG_ENABLE_MODULES = NO
|
||||
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Crashlytics/iOS" "${PODS_ROOT}/Fabric/iOS" "${PODS_ROOT}/GoogleSignIn/Frameworks"
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 STATIC_LIBRARY=1 STATIC_LIBRARY=1 MUPENPLUSAPI TXFILTER_LIB OS_IOS GLESX GL_ERROR_DEBUG GL_DEBUG GLESX PNG_ARM_NEON_OPT=0
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 STATIC_LIBRARY=1 JIT_ENABLED=1 STATIC_LIBRARY=1 STATIC_LIBRARY=1 MUPENPLUSAPI TXFILTER_LIB OS_IOS GLESX GL_ERROR_DEBUG GL_DEBUG GLESX PNG_ARM_NEON_OPT=0
|
||||
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DSDeltaCore" "${PODS_ROOT}/Headers/Public/DeltaCore" "${PODS_ROOT}/Headers/Public/GBADeltaCore" "${PODS_ROOT}/Headers/Public/GBCDeltaCore" "${PODS_ROOT}/Headers/Public/GTMSessionFetcher" "${PODS_ROOT}/Headers/Public/GoogleAPIClientForREST" "${PODS_ROOT}/Headers/Public/GoogleToolboxForMac" "${PODS_ROOT}/Headers/Public/Harmony" "${PODS_ROOT}/Headers/Public/MelonDSDeltaCore" "${PODS_ROOT}/Headers/Public/N64DeltaCore" "${PODS_ROOT}/Headers/Public/NESDeltaCore" "${PODS_ROOT}/Headers/Public/Roxas" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/SMCalloutView" "${PODS_ROOT}/Headers/Public/SNESDeltaCore" "${PODS_ROOT}/Headers/Public/SQLite.swift" "${PODS_ROOT}/Headers/Public/SwiftyDropbox" "${PODS_CONFIGURATION_BUILD_DIR}" "$(PODS_ROOT)/Headers/Private/DSDeltaCore/desmume/desmume/src/libretro-common/include" "${PODS_CONFIGURATION_BUILD_DIR}" "$(PODS_ROOT)/Headers/Private/GBADeltaCore/SFML/include" "$(PODS_ROOT)/Headers/Private/GBADeltaCore/SFML/src" "${PODS_CONFIGURATION_BUILD_DIR}" "${PODS_CONFIGURATION_BUILD_DIR}" "$(PODS_ROOT)/Headers/Private/MelonDSDeltaCore/melonDS/src" "${PODS_CONFIGURATION_BUILD_DIR}" "$(PODS_ROOT)/Headers/Private/N64DeltaCore/Mupen64Plus/mupen64plus-core/subprojects/**" "$(PODS_ROOT)/Headers/Private/N64DeltaCore/libMupen64Plus/SDL" "${PODS_CONFIGURATION_BUILD_DIR}" "$(PODS_ROOT)/Headers/Private/N64DeltaCore/Mupen64Plus/mupen64plus-core/subprojects/**" "$(PODS_ROOT)/Headers/Private/N64DeltaCore/libMupen64Plus/SDL" "$(PODS_ROOT)/Headers/Private/N64DeltaCore/Mupen64Plus/GLideN64/src" "$(PODS_ROOT)/Headers/Private/N64DeltaCore/Mupen64Plus/GLideN64/src/inc"
|
||||
LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Alamofire" "${PODS_CONFIGURATION_BUILD_DIR}/DSDeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/DeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/GBADeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/GBCDeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleAPIClientForREST" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleToolboxForMac" "${PODS_CONFIGURATION_BUILD_DIR}/Harmony" "${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/N64DeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/NESDeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/Roxas" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SMCalloutView" "${PODS_CONFIGURATION_BUILD_DIR}/SNESDeltaCore" "${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyDropbox" "${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation"
|
||||
OTHER_CFLAGS = $(inherited) -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DSDeltaCore/DSDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DeltaCore/DeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/GBADeltaCore/GBADeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/GBCDeltaCore/GBCDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Harmony/Harmony.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore/MelonDSDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/N64DeltaCore/N64DeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/NESDeltaCore/NESDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SNESDeltaCore/SNESDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SwiftyDropbox/SwiftyDropbox.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/GTMSessionFetcher/GTMSessionFetcher.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/GoogleAPIClientForREST/GoogleAPIClientForREST.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/GoogleToolboxForMac/GoogleToolboxForMac.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/Roxas/Roxas.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/SDWebImage/SDWebImage.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/SMCalloutView/SMCalloutView.modulemap" -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/DSDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/GBADeltaCore" -isystem "${PODS_ROOT}/Headers/Public/GBCDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/Harmony" -isystem "${PODS_ROOT}/Headers/Public/MelonDSDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/N64DeltaCore" -isystem "${PODS_ROOT}/Headers/Public/NESDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/SNESDeltaCore" -iframework "${PODS_ROOT}/Crashlytics/iOS" -iframework "${PODS_ROOT}/Fabric/iOS" -iframework "${PODS_ROOT}/GoogleSignIn/Frameworks" -DHOST_DARWIN -DDESMUME_COCOA -DHAVE_OPENGL -DHAVE_LIBZ -DANDROID -fexceptions -ftree-vectorize -DCOMPRESS_MT -DIOS -DOBJ_C -marm -fvisibility=hidden -DHAVE_CSTDINT -fno-strict-aliasing -DGCC -pthread -fPIC -D__unix__ -ffast-math -fno-strict-aliasing -DGCC -pthread -fPIC -D__unix__ -ffast-math -D__VEC4_OPT -fvisibility=hidden -funsigned-char -ffast-math -finline -fno-builtin -fno-common -fomit-frame-pointer -funroll-loops -fstrict-aliasing -DHAVE_STDINT_H -DARM
|
||||
OTHER_CFLAGS = $(inherited) -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DSDeltaCore/DSDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DeltaCore/DeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/GBADeltaCore/GBADeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/GBCDeltaCore/GBCDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Harmony/Harmony.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore/MelonDSDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/N64DeltaCore/N64DeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/NESDeltaCore/NESDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SNESDeltaCore/SNESDeltaCore.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SwiftyDropbox/SwiftyDropbox.modulemap" -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/GTMSessionFetcher/GTMSessionFetcher.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/GoogleAPIClientForREST/GoogleAPIClientForREST.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/GoogleToolboxForMac/GoogleToolboxForMac.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/Roxas/Roxas.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/SDWebImage/SDWebImage.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/SMCalloutView/SMCalloutView.modulemap" -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/DSDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/GBADeltaCore" -isystem "${PODS_ROOT}/Headers/Public/GBCDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/Harmony" -isystem "${PODS_ROOT}/Headers/Public/MelonDSDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/N64DeltaCore" -isystem "${PODS_ROOT}/Headers/Public/NESDeltaCore" -isystem "${PODS_ROOT}/Headers/Public/SNESDeltaCore" -iframework "${PODS_ROOT}/Crashlytics/iOS" -iframework "${PODS_ROOT}/Fabric/iOS" -iframework "${PODS_ROOT}/GoogleSignIn/Frameworks" -DHOST_DARWIN -DDESMUME_COCOA -DHAVE_OPENGL -DHAVE_LIBZ -DANDROID -fexceptions -ftree-vectorize -DCOMPRESS_MT -DIOS -DOBJ_C -marm -fvisibility=hidden -DSTATIC_LIBRARY -DHAVE_CSTDINT -fno-strict-aliasing -DGCC -pthread -fPIC -D__unix__ -ffast-math -fno-strict-aliasing -DGCC -pthread -fPIC -D__unix__ -ffast-math -D__VEC4_OPT -fvisibility=hidden -funsigned-char -ffast-math -finline -fno-builtin -fno-common -fomit-frame-pointer -funroll-loops -fstrict-aliasing -DHAVE_STDINT_H -DARM
|
||||
OTHER_LDFLAGS = $(inherited) -ObjC -Wl,-exported_symbol,_Video_PluginStartup,-exported_symbol,_Video_PluginShutdown,-exported_symbol,_Video_PluginGetVersion,-exported_symbol,_Video_RomOpen,-exported_symbol,_Video_RomClosed,-exported_symbol,_ConfigGetSharedDataFilepath,-exported_symbol,_ConfigGetUserConfigPath,-exported_symbol,_ConfigGetUserCachePath,-exported_symbol,_ConfigGetUserDataPath,-exported_symbol,_ConfigOpenSection,-exported_symbol,_ConfigDeleteSection,-exported_symbol,_ConfigSaveSection,-exported_symbol,_ConfigSaveFile,-exported_symbol,_ConfigSetDefaultInt,-exported_symbol,_ConfigSetDefaultFloat,-exported_symbol,_ConfigSetDefaultBool,-exported_symbol,_ConfigSetDefaultString,-exported_symbol,_ConfigGetParamInt,-exported_symbol,_ConfigGetParamFloat,-exported_symbol,_ConfigGetParamBool,-exported_symbol,_ConfigGetParamString,-exported_symbol,_ConfigExternalGetParameter,-exported_symbol,_ConfigExternalOpen,-exported_symbol,_ConfigExternalClose,-exported_symbol,_VidExt_Init,-exported_symbol,_VidExt_Quit,-exported_symbol,_VidExt_ListFullscreenModes,-exported_symbol,_VidExt_SetVideoMode,-exported_symbol,_VidExt_SetCaption,-exported_symbol,_VidExt_ToggleFullScreen,-exported_symbol,_VidExt_ResizeWindow,-exported_symbol,_VidExt_GL_GetProcAddress,-exported_symbol,_VidExt_GL_SetAttribute,-exported_symbol,_VidExt_GL_GetAttribute,-exported_symbol,_VidExt_GL_SwapBuffers,-exported_symbol,_ChangeWindow,-exported_symbol,_InitiateGFX,-exported_symbol,_MoveScreen,-exported_symbol,_ProcessDList,-exported_symbol,_ProcessRDPList,-exported_symbol,_ShowCFB,-exported_symbol,_UpdateScreen,-exported_symbol,_ViStatusChanged,-exported_symbol,_ViWidthChanged,-exported_symbol,_ReadScreen2,-exported_symbol,_SetRenderingCallback,-exported_symbol,_FBRead,-exported_symbol,_FBWrite,-exported_symbol,_FBGetFrameBufferInfo,-exported_symbol,_ResizeVideoOutput,-exported_symbol,_RSP_PluginStartup,-exported_symbol,_RSP_PluginShutdown,-exported_symbol,_RSP_PluginGetVersion,-exported_symbol,_DoRspCycles,-exported_symbol,_InitiateRSP,-exported_symbol,_RSP_RomClosed,-exported_symbol,_CoreGetAPIVersions,-exported_symbol,_ConfigGetParameter,-exported_symbol,_ConfigSetParameter,-exported_symbol,_CoreDoCommand -l"Alamofire" -l"DSDeltaCore" -l"DeltaCore" -l"GBADeltaCore" -l"GBCDeltaCore" -l"GTMSessionFetcher" -l"GoogleAPIClientForREST" -l"GoogleToolboxForMac" -l"Harmony" -l"MelonDSDeltaCore" -l"N64DeltaCore" -l"NESDeltaCore" -l"Roxas" -l"SDWebImage" -l"SMCalloutView" -l"SNESDeltaCore" -l"SQLite.swift" -l"SwiftyDropbox" -l"ZIPFoundation" -l"c++" -l"sqlite3" -l"z" -framework "CoreGraphics" -framework "CoreText" -framework "Crashlytics" -framework "Fabric" -framework "Foundation" -framework "GoogleSignIn" -framework "ImageIO" -framework "LocalAuthentication" -framework "SafariServices" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "WebKit"
|
||||
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DSDeltaCore/DSDeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/DeltaCore/DeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/GBADeltaCore/GBADeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/GBCDeltaCore/GBCDeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/Harmony/Harmony.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/MelonDSDeltaCore/MelonDSDeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/N64DeltaCore/N64DeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/NESDeltaCore/NESDeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SNESDeltaCore/SNESDeltaCore.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/SwiftyDropbox/SwiftyDropbox.modulemap" -Xcc -fmodule-map-file="${PODS_CONFIGURATION_BUILD_DIR}/ZIPFoundation/ZIPFoundation.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/GTMSessionFetcher/GTMSessionFetcher.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/GoogleAPIClientForREST/GoogleAPIClientForREST.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/GoogleToolboxForMac/GoogleToolboxForMac.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/Roxas/Roxas.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/SDWebImage/SDWebImage.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/SMCalloutView/SMCalloutView.modulemap"
|
||||
PODS_BUILD_DIR = ${BUILD_DIR}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user