Skip to content

Commit

Permalink
Fix some Xcode 12 warnings (#1482)
Browse files Browse the repository at this point in the history 
* Fix version warning

* Remove duplicate environment variable

* Remove warning

* Silence OpenGLES/GLKit deprection warnings

* Fix enableContorllerInput typo

* Fix backward matching warning
  • Loading branch information
@dnicolson
dnicolson committed Jan 4, 2021
1 parent e2fb61f commit 24349c1
Show file tree
Hide file tree
Showing 20 changed files with 87 additions and 44 deletions.
3 changes: 3 additions & 0 deletions Cores/FCEU/PVFCEU.xcodeproj/project.pbxproj
View file
Expand Up @@ -2008,6 +2008,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_VERSION = 5.0;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Debug;
};
Expand Down Expand Up @@ -2059,6 +2060,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Release;
};
Expand Down Expand Up @@ -2109,6 +2111,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Archive;
};
Expand Down
3 changes: 3 additions & 0 deletions Cores/Gambatte/PVGB.xcodeproj/project.pbxproj
View file
Expand Up @@ -864,6 +864,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_VERSION = 5.0;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Debug;
};
Expand Down Expand Up @@ -915,6 +916,7 @@
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Release;
};
Expand Down Expand Up @@ -965,6 +967,7 @@
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Archive;
};
Expand Down
3 changes: 3 additions & 0 deletions Cores/Genesis-Plus-GX/PVGenesis.xcodeproj/project.pbxproj
View file
Expand Up @@ -875,6 +875,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Debug;
};
Expand Down Expand Up @@ -923,6 +924,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Release;
};
Expand Down Expand Up @@ -970,6 +972,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Archive;
};
Expand Down
3 changes: 3 additions & 0 deletions Cores/Mupen64Plus/PVMupen64Plus.xcodeproj/project.pbxproj
View file
Expand Up @@ -6065,6 +6065,7 @@
SDKROOT = iphoneos;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Debug;
};
Expand Down Expand Up @@ -6121,6 +6122,7 @@
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Release;
};
Expand Down Expand Up @@ -6176,6 +6178,7 @@
SDKROOT = iphoneos;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 10.0;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Archive;
};
Expand Down
4 changes: 3 additions & 1 deletion Cores/PokeMini/PVPokeMini.xcodeproj/project.pbxproj
View file
Expand Up @@ -770,6 +770,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.11;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Debug;
};
Expand Down Expand Up @@ -819,6 +820,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.11;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Release;
};
Expand Down Expand Up @@ -867,6 +869,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACOSX_DEPLOYMENT_TARGET = 10.11;
SDKROOT = iphoneos;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Archive;
};
Expand Down Expand Up @@ -1072,7 +1075,6 @@
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"NO_ZIP=1",
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
Expand Down
3 changes: 3 additions & 0 deletions Cores/Reicast/PVReicast.xcodeproj/project.pbxproj
View file
Expand Up @@ -4499,6 +4499,7 @@
);
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -4746,6 +4747,7 @@
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "";
SDKROOT = iphoneos;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -4832,6 +4834,7 @@
);
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down
3 changes: 3 additions & 0 deletions Cores/Stella/PVStella.xcodeproj/project.pbxproj
View file
Expand Up @@ -906,6 +906,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Debug;
};
Expand Down Expand Up @@ -949,6 +950,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Release;
};
Expand Down Expand Up @@ -991,6 +993,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Archive;
};
Expand Down
3 changes: 3 additions & 0 deletions Cores/TGBDual/PVTGBDual.xcodeproj/project.pbxproj
View file
Expand Up @@ -634,6 +634,7 @@
);
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -817,6 +818,7 @@
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "";
SDKROOT = iphoneos;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -902,6 +904,7 @@
);
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down
3 changes: 3 additions & 0 deletions Cores/VisualBoyAdvance-M/PVGBA.xcodeproj/project.pbxproj
View file
Expand Up @@ -660,6 +660,7 @@
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Debug;
};
Expand Down Expand Up @@ -709,6 +710,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Release;
};
Expand Down Expand Up @@ -758,6 +760,7 @@
ONLY_ACTIVE_ARCH = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Archive;
};
Expand Down
3 changes: 3 additions & 0 deletions Cores/Yabause/PVYabause.xcodeproj/project.pbxproj
View file
Expand Up @@ -1000,6 +1000,7 @@
LLVM_LTO = NO;
MACOSX_DEPLOYMENT_TARGET = 10.11;
SDKROOT = iphoneos;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = "OpenGLES GLKit";
};
name = Archive;
};
Expand Down Expand Up @@ -1498,6 +1499,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.11;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = "OpenGLES GLKit";
};
name = Debug;
};
Expand Down Expand Up @@ -1554,6 +1556,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.11;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = "OpenGLES GLKit";
};
name = Release;
};
Expand Down
3 changes: 3 additions & 0 deletions Cores/snes9x/PVSNES.xcodeproj/project.pbxproj
View file
Expand Up @@ -1029,6 +1029,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Debug;
};
Expand Down Expand Up @@ -1080,6 +1081,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Release;
};
Expand Down Expand Up @@ -1130,6 +1132,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Archive;
};
Expand Down
2 changes: 1 addition & 1 deletion PVLibrary/PVLibrary/Domain/Core.swift
View file
Expand Up @@ -13,7 +13,7 @@ public struct Core: Codable {
public let identifier: String
public let principleClass: String
// public let systems: [System]
#warning("un-realm me")

public var systems: [System] {
let realm = try! Realm()
let systems = realm.objects(PVSystem.self).filter { $0.cores.contains(where: {
Expand Down
3 changes: 3 additions & 0 deletions Provenance.xcodeproj/project.pbxproj
View file
Expand Up @@ -2786,6 +2786,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 5.0;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = "OpenGLES GLKit";
VALID_ARCHS = "$(ARCHS_STANDARD)";
VERSIONING_SYSTEM = "apple-generic";
};
Expand Down Expand Up @@ -2839,6 +2840,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = "OpenGLES GLKit";
VALID_ARCHS = "$(ARCHS_STANDARD)";
VERSIONING_SYSTEM = "apple-generic";
};
Expand Down Expand Up @@ -3214,6 +3216,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = "OpenGLES GLKit";
VALID_ARCHS = "$(ARCHS_STANDARD)";
VERSIONING_SYSTEM = "apple-generic";
};
Expand Down
4 changes: 2 additions & 2 deletions Provenance/Emulator/PVEmulatorViewController+Saves.swift
View file
Expand Up @@ -198,7 +198,7 @@ extension PVEmulatorViewController {
let completion = {
self.core.setPauseEmulation(false)
self.isShowingMenu = false
self.enableContorllerInput(false)
self.enableControllerInput(false)
}

guard success else {
Expand Down Expand Up @@ -231,7 +231,7 @@ extension PVEmulatorViewController {
dismiss(animated: true, completion: nil)
core.setPauseEmulation(false)
isShowingMenu = false
enableContorllerInput(false)
enableControllerInput(false)
}

func saveStatesViewControllerCreateNewState(_ saveStatesViewController: PVSaveStatesViewController, completion: @escaping SaveCompletion) {
Expand Down

0 comments on commit 24349c1

Please sign in to comment.