-
Notifications
You must be signed in to change notification settings - Fork 439
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2124 from billhollings/revert-to-default-static-s…
…ymbols Revert to disabling MVK_HIDE_VULKAN_SYMBOLS by default.
- Loading branch information
Showing
7 changed files
with
97 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,20 +3,20 @@ | |
archiveVersion = 1; | ||
classes = { | ||
}; | ||
objectVersion = 54; | ||
objectVersion = 48; | ||
objects = { | ||
|
||
/* Begin PBXBuildFile section */ | ||
A90998A02B4EE8C3002CEF67 /* libMoltenVK.dylib in Copy MoltenVK Library */ = {isa = PBXBuildFile; fileRef = A909989F2B4EE8C3002CEF67 /* libMoltenVK.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; | ||
A90998A32B4EFB51002CEF67 /* libMoltenVK.dylib in Copy MoltenVK Library */ = {isa = PBXBuildFile; fileRef = A90998A22B4EFB51002CEF67 /* libMoltenVK.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; | ||
A90998A62B4EFBAA002CEF67 /* libMoltenVK.dylib in Copy MoltenVK Library */ = {isa = PBXBuildFile; fileRef = A90998A52B4EFBAA002CEF67 /* libMoltenVK.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; | ||
A93DBF3C24A2A4D500079F64 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B761C3AAE9800373FFD /* Icon.png */; }; | ||
A93DBF3E24A2A4D500079F64 /* Default~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B751C3AAE9800373FFD /* Default~ipad.png */; }; | ||
A93DBF3F24A2A4D500079F64 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B741C3AAE9800373FFD /* [email protected] */; }; | ||
A93DBF4124A2A4D500079F64 /* DemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B6F1C3AAE9800373FFD /* DemoViewController.m */; }; | ||
A93DBF4224A2A4D500079F64 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B6C1C3AAE9800373FFD /* AppDelegate.m */; }; | ||
A93DBF4324A2A4D500079F64 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B711C3AAE9800373FFD /* main.m */; }; | ||
A94D4CB724A2C9A3009C9139 /* MainTV.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A94D4CB624A2C9A3009C9139 /* MainTV.storyboard */; }; | ||
A991E27624FD543A00D968D4 /* MoltenVK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A991E27524FD543A00D968D4 /* MoltenVK.xcframework */; }; | ||
A991E27724FD543A00D968D4 /* MoltenVK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A991E27524FD543A00D968D4 /* MoltenVK.xcframework */; }; | ||
A991E27824FD543A00D968D4 /* MoltenVK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A991E27524FD543A00D968D4 /* MoltenVK.xcframework */; }; | ||
A9B53B151C3AC0BE00ABC6F6 /* macOS.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B8B1C3AAEA200373FFD /* macOS.xcassets */; }; | ||
A9B53B161C3AC0BE00ABC6F6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B8A1C3AAEA200373FFD /* Main.storyboard */; }; | ||
A9B53B181C3AC0BE00ABC6F6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B831C3AAEA200373FFD /* AppDelegate.m */; }; | ||
|
@@ -31,14 +31,52 @@ | |
A9B53B361C3AC15200ABC6F6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B711C3AAE9800373FFD /* main.m */; }; | ||
/* End PBXBuildFile section */ | ||
|
||
/* Begin PBXCopyFilesBuildPhase section */ | ||
A909989E2B4EE849002CEF67 /* Copy MoltenVK Library */ = { | ||
isa = PBXCopyFilesBuildPhase; | ||
buildActionMask = 2147483647; | ||
dstPath = ""; | ||
dstSubfolderSpec = 10; | ||
files = ( | ||
A90998A02B4EE8C3002CEF67 /* libMoltenVK.dylib in Copy MoltenVK Library */, | ||
); | ||
name = "Copy MoltenVK Library"; | ||
runOnlyForDeploymentPostprocessing = 0; | ||
}; | ||
A90998A12B4EFA78002CEF67 /* Copy MoltenVK Library */ = { | ||
isa = PBXCopyFilesBuildPhase; | ||
buildActionMask = 2147483647; | ||
dstPath = ""; | ||
dstSubfolderSpec = 10; | ||
files = ( | ||
A90998A32B4EFB51002CEF67 /* libMoltenVK.dylib in Copy MoltenVK Library */, | ||
); | ||
name = "Copy MoltenVK Library"; | ||
runOnlyForDeploymentPostprocessing = 0; | ||
}; | ||
A90998A42B4EFB81002CEF67 /* Copy MoltenVK Library */ = { | ||
isa = PBXCopyFilesBuildPhase; | ||
buildActionMask = 2147483647; | ||
dstPath = ""; | ||
dstSubfolderSpec = 10; | ||
files = ( | ||
A90998A62B4EFBAA002CEF67 /* libMoltenVK.dylib in Copy MoltenVK Library */, | ||
); | ||
name = "Copy MoltenVK Library"; | ||
runOnlyForDeploymentPostprocessing = 0; | ||
}; | ||
/* End PBXCopyFilesBuildPhase section */ | ||
|
||
/* Begin PBXFileReference section */ | ||
A904B5301C9A08C90008C013 /* cube.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cube.c; sourceTree = "<group>"; }; | ||
A904B5311C9A08C90008C013 /* cube.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = cube.frag; sourceTree = "<group>"; }; | ||
A904B5331C9A08C90008C013 /* cube.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = cube.vert; sourceTree = "<group>"; }; | ||
A909989F2B4EE8C3002CEF67 /* libMoltenVK.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMoltenVK.dylib; path = ../../MoltenVK/dylib/macOS/libMoltenVK.dylib; sourceTree = "<group>"; }; | ||
A90998A22B4EFB51002CEF67 /* libMoltenVK.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMoltenVK.dylib; path = ../../MoltenVK/dylib/iOS/libMoltenVK.dylib; sourceTree = "<group>"; }; | ||
A90998A52B4EFBAA002CEF67 /* libMoltenVK.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMoltenVK.dylib; path = ../../MoltenVK/dylib/tvOS/libMoltenVK.dylib; sourceTree = "<group>"; }; | ||
A93DBF4B24A2A4D500079F64 /* Cube.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Cube.app; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
A94D4CB424A2A95E009C9139 /* InfoTV.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = InfoTV.plist; sourceTree = "<group>"; }; | ||
A94D4CB624A2C9A3009C9139 /* MainTV.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = MainTV.storyboard; sourceTree = "<group>"; }; | ||
A991E27524FD543A00D968D4 /* MoltenVK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MoltenVK.xcframework; path = ../../MoltenVK/MoltenVK.xcframework; sourceTree = "<group>"; }; | ||
A9B53B271C3AC0BE00ABC6F6 /* Cube.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Cube.app; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
A9B53B431C3AC15200ABC6F6 /* Cube.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Cube.app; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
A9B67B6B1C3AAE9800373FFD /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; | ||
|
@@ -69,23 +107,20 @@ | |
isa = PBXFrameworksBuildPhase; | ||
buildActionMask = 2147483647; | ||
files = ( | ||
A991E27724FD543A00D968D4 /* MoltenVK.xcframework in Frameworks */, | ||
); | ||
runOnlyForDeploymentPostprocessing = 0; | ||
}; | ||
A9B53B1B1C3AC0BE00ABC6F6 /* Frameworks */ = { | ||
isa = PBXFrameworksBuildPhase; | ||
buildActionMask = 2147483647; | ||
files = ( | ||
A991E27824FD543A00D968D4 /* MoltenVK.xcframework in Frameworks */, | ||
); | ||
runOnlyForDeploymentPostprocessing = 0; | ||
}; | ||
A9B53B371C3AC15200ABC6F6 /* Frameworks */ = { | ||
isa = PBXFrameworksBuildPhase; | ||
buildActionMask = 2147483647; | ||
files = ( | ||
A991E27624FD543A00D968D4 /* MoltenVK.xcframework in Frameworks */, | ||
); | ||
runOnlyForDeploymentPostprocessing = 0; | ||
}; | ||
|
@@ -181,7 +216,9 @@ | |
A9C2ABA82185085B00DDBC03 /* Frameworks */ = { | ||
isa = PBXGroup; | ||
children = ( | ||
A991E27524FD543A00D968D4 /* MoltenVK.xcframework */, | ||
A90998A52B4EFBAA002CEF67 /* libMoltenVK.dylib */, | ||
A909989F2B4EE8C3002CEF67 /* libMoltenVK.dylib */, | ||
A90998A22B4EFB51002CEF67 /* libMoltenVK.dylib */, | ||
); | ||
name = Frameworks; | ||
sourceTree = "<group>"; | ||
|
@@ -195,6 +232,7 @@ | |
buildPhases = ( | ||
A93DBF3B24A2A4D500079F64 /* Resources */, | ||
A93DBF4024A2A4D500079F64 /* Sources */, | ||
A90998A42B4EFB81002CEF67 /* Copy MoltenVK Library */, | ||
A93DBF4424A2A4D500079F64 /* Frameworks */, | ||
); | ||
buildRules = ( | ||
|
@@ -212,6 +250,7 @@ | |
buildPhases = ( | ||
A9B53B141C3AC0BE00ABC6F6 /* Resources */, | ||
A9B53B171C3AC0BE00ABC6F6 /* Sources */, | ||
A909989E2B4EE849002CEF67 /* Copy MoltenVK Library */, | ||
A9B53B1B1C3AC0BE00ABC6F6 /* Frameworks */, | ||
); | ||
buildRules = ( | ||
|
@@ -229,6 +268,7 @@ | |
buildPhases = ( | ||
A9B53B2E1C3AC15200ABC6F6 /* Resources */, | ||
A9B53B331C3AC15200ABC6F6 /* Sources */, | ||
A90998A12B4EFA78002CEF67 /* Copy MoltenVK Library */, | ||
A9B53B371C3AC15200ABC6F6 /* Frameworks */, | ||
); | ||
buildRules = ( | ||
|
@@ -247,6 +287,14 @@ | |
isa = PBXProject; | ||
attributes = { | ||
LastUpgradeCheck = 1410; | ||
TargetAttributes = { | ||
A9B53B0F1C3AC0BE00ABC6F6 = { | ||
ProvisioningStyle = Manual; | ||
}; | ||
A9B53B291C3AC15200ABC6F6 = { | ||
ProvisioningStyle = Automatic; | ||
}; | ||
}; | ||
}; | ||
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Cube" */; | ||
compatibilityVersion = "Xcode 8.0"; | ||
|
@@ -350,6 +398,7 @@ | |
MVK_SAMP_CUBE, | ||
); | ||
INFOPLIST_FILE = "$(SRCROOT)/iOS/InfoTV.plist"; | ||
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; | ||
MARKETING_VERSION = 1; | ||
PRODUCT_NAME = Cube; | ||
SDKROOT = appletvos; | ||
|
@@ -369,6 +418,7 @@ | |
MVK_SAMP_CUBE, | ||
); | ||
INFOPLIST_FILE = "$(SRCROOT)/iOS/InfoTV.plist"; | ||
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; | ||
MARKETING_VERSION = 1; | ||
PRODUCT_NAME = Cube; | ||
SDKROOT = appletvos; | ||
|
@@ -380,15 +430,21 @@ | |
isa = XCBuildConfiguration; | ||
buildSettings = { | ||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | ||
CODE_SIGN_IDENTITY = "Apple Development"; | ||
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; | ||
CODE_SIGN_STYLE = Manual; | ||
COMBINE_HIDPI_IMAGES = YES; | ||
DEVELOPMENT_TEAM = ""; | ||
GCC_PREFIX_HEADER = "$(SRCROOT)/macOS/Prefix.pch"; | ||
GCC_PREPROCESSOR_DEFINITIONS = ( | ||
"$(inherited)", | ||
MVK_SAMP_CUBE, | ||
); | ||
INFOPLIST_FILE = "$(SRCROOT)/macOS/Info.plist"; | ||
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; | ||
MACOSX_DEPLOYMENT_TARGET = 10.14; | ||
PRODUCT_NAME = Cube; | ||
PROVISIONING_PROFILE_SPECIFIER = ""; | ||
SDKROOT = macosx; | ||
}; | ||
name = Debug; | ||
|
@@ -397,15 +453,21 @@ | |
isa = XCBuildConfiguration; | ||
buildSettings = { | ||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | ||
CODE_SIGN_IDENTITY = "Apple Development"; | ||
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; | ||
CODE_SIGN_STYLE = Manual; | ||
COMBINE_HIDPI_IMAGES = YES; | ||
DEVELOPMENT_TEAM = ""; | ||
GCC_PREFIX_HEADER = "$(SRCROOT)/macOS/Prefix.pch"; | ||
GCC_PREPROCESSOR_DEFINITIONS = ( | ||
"$(inherited)", | ||
MVK_SAMP_CUBE, | ||
); | ||
INFOPLIST_FILE = "$(SRCROOT)/macOS/Info.plist"; | ||
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; | ||
MACOSX_DEPLOYMENT_TARGET = 10.14; | ||
PRODUCT_NAME = Cube; | ||
PROVISIONING_PROFILE_SPECIFIER = ""; | ||
SDKROOT = macosx; | ||
}; | ||
name = Release; | ||
|
@@ -414,7 +476,8 @@ | |
isa = XCBuildConfiguration; | ||
buildSettings = { | ||
CODE_SIGN_ENTITLEMENTS = Cube.entitlements; | ||
CODE_SIGN_IDENTITY = "iPhone Developer"; | ||
CODE_SIGN_IDENTITY = "Apple Development"; | ||
CODE_SIGN_STYLE = Automatic; | ||
CURRENT_PROJECT_VERSION = 1; | ||
DEVELOPMENT_TEAM = ""; | ||
GCC_PREFIX_HEADER = "$(SRCROOT)/iOS/Prefix.pch"; | ||
|
@@ -425,8 +488,10 @@ | |
INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist"; | ||
IPHONEOS_DEPLOYMENT_TARGET = 12.0; | ||
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2; | ||
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; | ||
MARKETING_VERSION = 1; | ||
PRODUCT_NAME = Cube; | ||
PROVISIONING_PROFILE_SPECIFIER = ""; | ||
SDKROOT = iphoneos; | ||
SUPPORTS_MACCATALYST = YES; | ||
TARGETED_DEVICE_FAMILY = "1,2,6"; | ||
|
@@ -437,7 +502,8 @@ | |
isa = XCBuildConfiguration; | ||
buildSettings = { | ||
CODE_SIGN_ENTITLEMENTS = Cube.entitlements; | ||
CODE_SIGN_IDENTITY = "iPhone Developer"; | ||
CODE_SIGN_IDENTITY = "Apple Development"; | ||
CODE_SIGN_STYLE = Automatic; | ||
CURRENT_PROJECT_VERSION = 1; | ||
DEVELOPMENT_TEAM = ""; | ||
GCC_PREFIX_HEADER = "$(SRCROOT)/iOS/Prefix.pch"; | ||
|
@@ -448,8 +514,10 @@ | |
INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist"; | ||
IPHONEOS_DEPLOYMENT_TARGET = 12.0; | ||
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2; | ||
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; | ||
MARKETING_VERSION = 1; | ||
PRODUCT_NAME = Cube; | ||
PROVISIONING_PROFILE_SPECIFIER = ""; | ||
SDKROOT = iphoneos; | ||
SUPPORTS_MACCATALYST = YES; | ||
TARGETED_DEVICE_FAMILY = "1,2,6"; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters