Skip to content

Commit

Permalink
Fix some XL build issues, mlutiplatform etc
Browse files Browse the repository at this point in the history 
Signed-off-by: Joseph Mattello <[email protected]>
  • Loading branch information
@JoeMatt
JoeMatt committed Apr 9, 2024
1 parent 4e2fbe9 commit 5c3b4d9
Show file tree
Hide file tree
Showing 7 changed files with 1,556 additions and 70 deletions.
228 changes: 222 additions & 6 deletions Cores/Dolphin/PVDolphin.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40377,7 +40377,6 @@
B30178DB207C901D0051B93D /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
Expand Down Expand Up @@ -40460,6 +40459,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
RELEASE,
"$(inherited)",
NDEBUG,
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
Expand All @@ -40475,10 +40475,10 @@
);
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "$(inherited)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos appletvsimulator appletvos";
SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos appletvsimulator appletvos";
SUPPORTS_MACCATALYST = YES;
SWIFT_COMPILATION_MODE = wholemodule;
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
Expand All @@ -40493,7 +40493,6 @@
B3C7621A20783162009950E4 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down Expand Up @@ -40581,26 +40580,241 @@
);
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVDolphin";
PRODUCT_NAME = PVDolphin;
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SUPPORTS_MACCATALYST = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_VERSION = 5.0;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Release;
};
B3D067CE2BC4FA2B00A7327F /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = B3447EBF218BE9DA00557ACE /* BuildFlags.xcconfig */;
buildSettings = {
ALLOW_TARGET_PLATFORM_SPECIALIZATION = NO;
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
DEBUG,
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"$(TOOLCHAIN_DIR)/usr/include\"",
"\"$(SRCROOT)/PVDolphinCore/Compatibility\"",
"\"$(SRCROOT)/dolphin-ios/Source/Core\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos appletvsimulator appletvos";
SUPPORTS_MACCATALYST = YES;
SWIFT_COMPILATION_MODE = singlefile;
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
TVOS_DEPLOYMENT_TARGET = 13.0;
VALIDATE_PRODUCT = NO;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
B3D067CF2BC4FA2B00A7327F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
DEAD_CODE_STRIPPING = YES;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(TARGET_BUILD_DIR)";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/PVDolphinCore/Core/PVDolphinCore-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"USE_GDBSTUB=1",
"NONJAILBROKEN=1",
"PB_ENABLE_MALLOC=1",
"PB_NO_PACKED_STRUCTS=1",
"PB_FIELD_32BIT=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"$(TOOLCHAIN_DIR)/usr/include\"",
"\"$(SRCROOT)/dolphin-ios/Source/Core/Core/IOS\"",
"\"$(SRCROOT)/dolphin-ios/Source/Core\"",
"\"$(SRCROOT)/dolphin-ios/Externals/fmt/include\"",
"\"$(SRCROOT)/dolphin-ios/Externals/soundtouch\"",
"\"$(SRCROOT)/dolphin-ios/Externals/mbedtls/include\"",
"\"$(SRCROOT)/dolphin-ios/Externals/Vulkan/Include\"",
);
INFOPLIST_FILE = "$(SRCROOT)/PVDolphin/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(PROJECT_DIR)/dolphin-ios/Externals/MoltenVK\"",
"\"$(SRCROOT)/lib\"",
"$(PROJECT_DIR)",
"\"$(SRCROOT)/lib/$(CONFIGURATION)-$(PLATFORM_NAME)\"",
"\"$(SRCROOT)/lib/$(CONFIGURATION)\"",
"$(PROJECT_DIR)/lib",
);
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "org.provenance-emu.PVDolphin";
PRODUCT_NAME = PVDolphin;
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SUPPORTS_MACCATALYST = YES;
SWIFT_VERSION = 5.0;
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Debug;
};
B3D067D02BC4FA2B00A7327F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
DEAD_CODE_STRIPPING = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
HEADER_SEARCH_PATHS = (
"\"$(SRCROOT)/dolphin-ios/Source/Core/Core/IOS\"",
"\"$(SRCROOT)/dolphin-ios/Source/Core\"",
"\"$(SRCROOT)/dolphin-ios/Externals/soundtouch\"",
"\"${SRCROOT}/dolphin-ios/Externals/FreeSurround/include\"",
"\"${SRCROOT}/dolphin-ios/Externals/fmt/include\"",
"\"$(TOOLCHAIN_DIR)/usr/include\"",
"$(inherited)",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/lib\"",
"\"$(SRCROOT)/lib/$(CONFIGURATION)\"",
);
OTHER_LDFLAGS = (
"-ObjC",
"$(inherited)",
);
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SUPPORTS_MACCATALYST = YES;
};
name = Debug;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
B30178D9207C901D0051B93D /* Build configuration list for PBXNativeTarget "dolphin" */ = {
isa = XCConfigurationList;
buildConfigurations = (
B30178DB207C901D0051B93D /* Release */,
B3D067D02BC4FA2B00A7327F /* Debug */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
Expand All @@ -40609,6 +40823,7 @@
isa = XCConfigurationList;
buildConfigurations = (
B3C7621720783162009950E4 /* Release */,
B3D067CE2BC4FA2B00A7327F /* Debug */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
Expand All @@ -40617,6 +40832,7 @@
isa = XCConfigurationList;
buildConfigurations = (
B3C7621A20783162009950E4 /* Release */,
B3D067CF2BC4FA2B00A7327F /* Debug */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
Expand Down
Loading

0 comments on commit 5c3b4d9

Please sign in to comment.