From 0e72c06e68f4b347d3963839141bef3c10bcd128 Mon Sep 17 00:00:00 2001 From: Bill Hollings Date: Mon, 5 Oct 2020 22:46:51 -0400 Subject: [PATCH 1/2] Update Xcode build settings check to Xcode 12.0. --- .../API-Samples.xcodeproj/project.pbxproj | 2 +- .../xcschemes/API-Samples-iOS.xcscheme | 2 +- .../xcschemes/API-Samples-macOS.xcscheme | 2 +- .../Cube/Cube.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Cube-iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/Cube-macOS.xcscheme | 2 +- .../xcshareddata/xcschemes/Cube-tvOS.xcscheme | 2 +- .../Hologram/Hologram.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Hologram-iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/Hologram-macOS.xcscheme | 2 +- ExternalDependencies.xcodeproj/project.pbxproj | 2 +- .../ExternalDependencies (Debug).xcscheme | 2 +- .../xcschemes/ExternalDependencies-iOS.xcscheme | 2 +- .../xcschemes/ExternalDependencies-macOS.xcscheme | 2 +- .../xcschemes/ExternalDependencies-tvOS.xcscheme | 2 +- .../xcschemes/ExternalDependencies.xcscheme | 2 +- .../xcschemes/SPIRV-Cross-iOS.xcscheme | 2 +- .../xcschemes/SPIRV-Cross-macOS.xcscheme | 2 +- .../xcschemes/SPIRV-Cross-tvOS.xcscheme | 2 +- .../xcschemes/SPIRV-Tools-iOS.xcscheme | 2 +- .../xcschemes/SPIRV-Tools-macOS.xcscheme | 2 +- .../xcschemes/SPIRV-Tools-tvOS.xcscheme | 2 +- .../xcshareddata/xcschemes/glslang-iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/glslang-macOS.xcscheme | 2 +- .../xcshareddata/xcschemes/glslang-tvOS.xcscheme | 2 +- MoltenVK/MoltenVK.xcodeproj/project.pbxproj | 14 +++++++------- .../xcshareddata/xcschemes/MoltenVK-iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/MoltenVK-macOS.xcscheme | 2 +- .../xcshareddata/xcschemes/MoltenVK-tvOS.xcscheme | 2 +- .../MVKShaderConverterTool Package.xcscheme | 2 +- .../xcschemes/MoltenVK Package (Debug).xcscheme | 2 +- .../xcschemes/MoltenVK Package (iOS only).xcscheme | 2 +- .../MoltenVK Package (macOS only).xcscheme | 2 +- .../MoltenVK Package (tvOS only).xcscheme | 2 +- .../xcschemes/MoltenVK Package.xcscheme | 2 +- .../xcschemes/MoltenVKShaderConverter-iOS.xcscheme | 2 +- .../MoltenVKShaderConverter-macOS.xcscheme | 2 +- .../MoltenVKShaderConverter-tvOS.xcscheme | 2 +- .../xcschemes/MoltenVKShaderConverter.xcscheme | 2 +- 39 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj b/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj index c7e68627..bd8fdf81 100644 --- a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj +++ b/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj @@ -537,7 +537,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1170; + LastUpgradeCheck = 1200; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "API-Samples" */; compatibilityVersion = "Xcode 8.0"; diff --git a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-iOS.xcscheme b/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-iOS.xcscheme index 0d687473..6dfcf408 100644 --- a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-iOS.xcscheme +++ b/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-iOS.xcscheme @@ -1,6 +1,6 @@ Date: Tue, 6 Oct 2020 11:40:45 -0400 Subject: [PATCH 2/2] Fix MoltenShaderConverter tvOS build to support tvOS 9.0. Move deployment target build settings from targets to projects. Move several other target build settings from targets to projects. --- MoltenVK/MoltenVK.xcodeproj/project.pbxproj | 12 +++--- .../project.pbxproj | 42 ++++--------------- 2 files changed, 13 insertions(+), 41 deletions(-) diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj index 2482ff3f..79fe5028 100644 --- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj +++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj @@ -1499,7 +1499,6 @@ isa = XCBuildConfiguration; buildSettings = { SDKROOT = appletvos; - TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -1507,14 +1506,12 @@ isa = XCBuildConfiguration; buildSettings = { SDKROOT = appletvos; - TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; }; A9B8EE1E1A98D796009C5A02 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - IPHONEOS_DEPLOYMENT_TARGET = 9.0; SDKROOT = iphoneos; }; name = Debug; @@ -1522,7 +1519,6 @@ A9B8EE1F1A98D796009C5A02 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - IPHONEOS_DEPLOYMENT_TARGET = 9.0; SDKROOT = iphoneos; }; name = Release; @@ -1530,7 +1526,6 @@ A9CBEDFF1B6299D800E45FDC /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - MACOSX_DEPLOYMENT_TARGET = 10.11; SDKROOT = macosx; }; name = Debug; @@ -1538,7 +1533,6 @@ A9CBEE001B6299D800E45FDC /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - MACOSX_DEPLOYMENT_TARGET = 10.11; SDKROOT = macosx; }; name = Release; @@ -1597,7 +1591,9 @@ "\"$(SRCROOT)/../External/cereal/include\"", "\"${BUILT_PRODUCTS_DIR}\"", ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = YES; MVK_SKIP_DYLIB = ""; "MVK_SKIP_DYLIB[sdk=appletvsimulator*]" = YES; @@ -1606,6 +1602,7 @@ PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a"; PRODUCT_NAME = MoltenVK; SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -1661,7 +1658,9 @@ "\"$(SRCROOT)/../External/cereal/include\"", "\"${BUILT_PRODUCTS_DIR}\"", ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; MVK_SKIP_DYLIB = ""; "MVK_SKIP_DYLIB[sdk=appletvsimulator*]" = YES; @@ -1669,6 +1668,7 @@ PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a"; PRODUCT_NAME = MoltenVK; SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj index 0375ed45..05e080a1 100644 --- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj +++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj @@ -518,33 +518,20 @@ 2FEA0D122490381A00EEF3AD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross", - ); - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; SDKROOT = appletvos; - TVOS_DEPLOYMENT_TARGET = 11.0; }; name = Debug; }; 2FEA0D132490381A00EEF3AD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross", - ); - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; SDKROOT = appletvos; - TVOS_DEPLOYMENT_TARGET = 11.0; }; name = Release; }; A9092A911A81717C00051823 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - GENERATE_MASTER_OBJECT_FILE = NO; MACH_O_TYPE = mh_execute; OTHER_LDFLAGS = ( "-ObjC", @@ -557,7 +544,6 @@ A9092A921A81717C00051823 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - GENERATE_MASTER_OBJECT_FILE = NO; MACH_O_TYPE = mh_execute; OTHER_LDFLAGS = ( "-ObjC", @@ -570,11 +556,6 @@ A93903BD1C57E9D700FE90DC /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross", - ); - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; SDKROOT = iphoneos; }; name = Debug; @@ -582,11 +563,6 @@ A93903BE1C57E9D700FE90DC /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross", - ); - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; SDKROOT = iphoneos; }; name = Release; @@ -594,11 +570,6 @@ A93903C51C57E9ED00FE90DC /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross", - ); - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; SDKROOT = macosx; }; name = Debug; @@ -606,11 +577,6 @@ A93903C61C57E9ED00FE90DC /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross", - ); - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; SDKROOT = macosx; }; name = Release; @@ -643,7 +609,10 @@ GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross", + "DEBUG=1", + ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -666,6 +635,7 @@ ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = MoltenVKShaderConverter; SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -698,6 +668,7 @@ GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = fast; + GCC_PREPROCESSOR_DEFINITIONS = "SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross"; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -719,6 +690,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_NAME = MoltenVKShaderConverter; SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; }; name = Release;