diff --git a/ctf/macos/ctf.xcodeproj/project.pbxproj b/ctf/macos/ctf.xcodeproj/project.pbxproj index ee15f0b..2ca236a 100644 --- a/ctf/macos/ctf.xcodeproj/project.pbxproj +++ b/ctf/macos/ctf.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -195,7 +195,8 @@ E29552A321F61D9600336DD3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 2600; ORGANIZATIONNAME = Krzysztof; TargetAttributes = { E29552AA21F61D9600336DD3 = { @@ -224,6 +225,7 @@ /* Begin PBXShellScriptBuildPhase section */ E296564721F8873000BEC8E0 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -306,13 +308,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -366,13 +369,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -395,9 +399,12 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; "OTHER_CFLAGS[arch=*]" = ( "-D_DEBUG", "-Wno-dangling-else", @@ -406,7 +413,6 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Debug; }; @@ -414,9 +420,12 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; "OTHER_CFLAGS[arch=*]" = ( "-DNDEBUG", "-Wno-dangling-else", @@ -425,7 +434,6 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Release; }; diff --git a/game/macos/game.xcodeproj/project.pbxproj b/game/macos/game.xcodeproj/project.pbxproj index 53580bb..d8257c7 100644 --- a/game/macos/game.xcodeproj/project.pbxproj +++ b/game/macos/game.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -341,7 +341,8 @@ E29551F921F618E100336DD3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 2600; ORGANIZATIONNAME = Krzysztof; TargetAttributes = { E295520021F618E100336DD3 = { @@ -370,6 +371,7 @@ /* Begin PBXShellScriptBuildPhase section */ E296564621F8869500BEC8E0 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -474,13 +476,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -534,13 +537,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -563,9 +567,12 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; "OTHER_CFLAGS[arch=*]" = ( "-D_DEBUG", "-Wno-dangling-else", @@ -574,7 +581,6 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Debug; }; @@ -582,9 +588,12 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; "OTHER_CFLAGS[arch=*]" = ( "-DNDEBUG", "-Wno-dangling-else", @@ -593,7 +602,6 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Release; }; diff --git a/macos/quake2.xcodeproj/project.pbxproj b/macos/quake2.xcodeproj/project.pbxproj index 928054f..9a59d0f 100644 --- a/macos/quake2.xcodeproj/project.pbxproj +++ b/macos/quake2.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -303,6 +303,7 @@ /* Begin PBXShellScriptBuildPhase section */ E296564421F8853000BEC8E0 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -406,7 +407,7 @@ 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_STRICT_PROTOTYPES = NO; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; @@ -466,7 +467,7 @@ 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_STRICT_PROTOTYPES = NO; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; @@ -494,6 +495,7 @@ E295530521F620FB00336DD3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; "LD_RUNPATH_SEARCH_PATHS[arch=*]" = $VULKAN_SDK/lib; @@ -505,14 +507,15 @@ "-Wno-shorten-64-to-32", "-Wno-pointer-sign", ); + PRODUCT_BUNDLE_IDENTIFIER = com.kondrak.vkquake2; PRODUCT_NAME = "$(TARGET_NAME)"; - VALID_ARCHS = x86_64; }; name = Debug; }; E295530621F620FB00336DD3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; "LD_RUNPATH_SEARCH_PATHS[arch=*]" = $VULKAN_SDK/lib; @@ -524,8 +527,8 @@ "-Wno-shorten-64-to-32", "-Wno-pointer-sign", ); + PRODUCT_BUNDLE_IDENTIFIER = com.kondrak.vkquake2; PRODUCT_NAME = "$(TARGET_NAME)"; - VALID_ARCHS = x86_64; }; name = Release; }; diff --git a/macos/vkQuake2.xcworkspace/xcshareddata/xcschemes/vkQuake2.xcscheme b/macos/vkQuake2.xcworkspace/xcshareddata/xcschemes/vkQuake2.xcscheme index 3395bbf..c79a3b6 100644 --- a/macos/vkQuake2.xcworkspace/xcshareddata/xcschemes/vkQuake2.xcscheme +++ b/macos/vkQuake2.xcworkspace/xcshareddata/xcschemes/vkQuake2.xcscheme @@ -1,6 +1,6 @@ + typedef struct { FILE *log_fp; diff --git a/macos/win_macos.m b/macos/win_macos.m index 69e2af5..c253087 100644 --- a/macos/win_macos.m +++ b/macos/win_macos.m @@ -247,7 +247,7 @@ static int translateKey(NSEvent *keyEvent) } // handle window and system events -void CocoaHandleEvents() +void CocoaHandleEvents(void) { @autoreleasepool { if(window == nil) return; @@ -389,16 +389,19 @@ void CocoaCreateWindow(int x, int y, int *w, int *h, qboolean fullscreen) } // destroy Cocoa window -void CocoaDestroyWindow() +void CocoaDestroyWindow(void) { [window close]; window = nil; } // attach Metal view to the window - return it so we can use it when creating Vulkan surface -const void *CocoaAddMetalView() +const void *CocoaAddMetalView(void) { - MetalView *mv = [[MetalView alloc] initWithFrame:[[window contentView] frame]]; - [[window contentView] addSubview:mv]; - return (__bridge const void *)mv; + CAMetalLayer* layer = [CAMetalLayer layer]; + [layer setContentsScale: [window backingScaleFactor] ]; + + window.contentView.layer = layer; + window.contentView.wantsLayer = YES; + return (__bridge const void *)(layer); } diff --git a/ref_vk/macos/ref_vk.xcodeproj/project.pbxproj b/ref_vk/macos/ref_vk.xcodeproj/project.pbxproj index 8fe4f07..c267f86 100644 --- a/ref_vk/macos/ref_vk.xcodeproj/project.pbxproj +++ b/ref_vk/macos/ref_vk.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -234,7 +234,8 @@ E295536521F6264C00336DD3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 2600; ORGANIZATIONNAME = Krzysztof; TargetAttributes = { E295536C21F6264C00336DD3 = { @@ -263,6 +264,7 @@ /* Begin PBXShellScriptBuildPhase section */ E2D6969B21F64D70009AF955 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -342,13 +344,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -402,13 +405,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -423,6 +427,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = NO; SDKROOT = macosx; }; name = Release; @@ -432,6 +437,7 @@ buildSettings = { CLANG_WARN_DOCUMENTATION_COMMENTS = NO; CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; @@ -439,6 +445,8 @@ GCC_WARN_UNUSED_VARIABLE = NO; HEADER_SEARCH_PATHS = "$(VULKAN_SDK)/include"; LIBRARY_SEARCH_PATHS = "$(VULKAN_SDK)/lib"; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "-D_DEBUG", "-Wno-dangling-else", @@ -449,7 +457,6 @@ OTHER_CPLUSPLUSFLAGS = ""; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Debug; }; @@ -458,6 +465,7 @@ buildSettings = { CLANG_WARN_DOCUMENTATION_COMMENTS = NO; CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; @@ -465,6 +473,8 @@ GCC_WARN_UNUSED_VARIABLE = NO; HEADER_SEARCH_PATHS = "$(VULKAN_SDK)/include"; LIBRARY_SEARCH_PATHS = "$(VULKAN_SDK)/lib"; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ""; "OTHER_CFLAGS[arch=*]" = ( "-DNDEBUG", @@ -475,7 +485,6 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Release; }; diff --git a/ref_vk/vk_common.c b/ref_vk/vk_common.c index 2de322b..ae2849f 100644 --- a/ref_vk/vk_common.c +++ b/ref_vk/vk_common.c @@ -1552,7 +1552,7 @@ void QVk_Shutdown( void ) ** This is responsible for initializing Vulkan. ** */ -qboolean QVk_Init() +qboolean QVk_Init(void) { uint32_t instanceVersion = VK_API_VERSION_1_0; @@ -1957,7 +1957,7 @@ qboolean QVk_Init() return true; } -VkResult QVk_BeginFrame() +VkResult QVk_BeginFrame(void) { // reset tracking variables vk_state.current_pipeline = VK_NULL_HANDLE; diff --git a/ref_vk/vk_device.c b/ref_vk/vk_device.c index 7245d1a..0e56b0b 100644 --- a/ref_vk/vk_device.c +++ b/ref_vk/vk_device.c @@ -64,9 +64,11 @@ static void getBestPhysicalDevice(const VkPhysicalDevice *devices, int preferred vkGetPhysicalDeviceProperties(devices[i], &deviceProperties); vkGetPhysicalDeviceFeatures(devices[i], &deviceFeatures); vkGetPhysicalDeviceQueueFamilyProperties(devices[i], &queueFamilyCount, NULL); - + if (queueFamilyCount == 0) continue; + + ri.Con_Printf(PRINT_ALL, "...selected GPU %s\n", deviceProperties.deviceName); // prefer discrete GPU but if it's the only one available then don't be picky // also - if the user specifies a preferred device, select it @@ -90,7 +92,8 @@ static void getBestPhysicalDevice(const VkPhysicalDevice *devices, int preferred for (uint32_t j = 0; j < queueFamilyCount; ++j) { // check if this queue family has support for presentation - VkBool32 presentSupported; + + VkBool32 presentSupported = VK_FALSE; VK_VERIFY(vkGetPhysicalDeviceSurfaceSupportKHR(devices[i], j, vk_surface, &presentSupported)); // good optimization would be to find a queue where presentIdx == gfxQueueIdx for less overhead @@ -141,10 +144,12 @@ static qboolean selectPhysicalDevice(int preferredDeviceIdx) return false; } - ri.Con_Printf(PRINT_ALL, "...found %d Vulkan-capable device(s)\n", physicalDeviceCount); - - VkPhysicalDevice *physicalDevices = (VkPhysicalDevice *)malloc(physicalDeviceCount * sizeof(VkPhysicalDevice)); + VkPhysicalDevice *physicalDevices = malloc(physicalDeviceCount * sizeof(VkPhysicalDevice)); VK_VERIFY(vkEnumeratePhysicalDevices(vk_instance, &physicalDeviceCount, physicalDevices)); + + ri.Con_Printf(PRINT_ALL, "...found %d Vulkan-capable device(s)\n", physicalDeviceCount); + + ri.Con_Printf(PRINT_ALL, "...now testing device 1\n"); getBestPhysicalDevice(physicalDevices, preferredDeviceIdx < physicalDeviceCount ? preferredDeviceIdx : -1, physicalDeviceCount); free(physicalDevices); @@ -159,7 +164,7 @@ static qboolean selectPhysicalDevice(int preferredDeviceIdx) } // internal helper -static VkResult createLogicalDevice() +static VkResult createLogicalDevice(void) { // at least one queue (graphics and present combined) has to be present uint32_t numQueues = 1; diff --git a/ref_vk/vk_local.h b/ref_vk/vk_local.h index 49fbd92..ab858fb 100644 --- a/ref_vk/vk_local.h +++ b/ref_vk/vk_local.h @@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif #ifdef __APPLE__ -# define VK_USE_PLATFORM_MACOS_MVK +# define VK_USE_PLATFORM_METAL_EXT #endif #include diff --git a/rogue/macos/rogue.xcodeproj/project.pbxproj b/rogue/macos/rogue.xcodeproj/project.pbxproj index 53365d4..9a3b844 100644 --- a/rogue/macos/rogue.xcodeproj/project.pbxproj +++ b/rogue/macos/rogue.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -403,7 +403,8 @@ E29551F921F618E100336DD3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 2600; ORGANIZATIONNAME = Krzysztof; TargetAttributes = { E295520021F618E100336DD3 = { @@ -432,6 +433,7 @@ /* Begin PBXShellScriptBuildPhase section */ E296564621F8869500BEC8E0 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -550,13 +552,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -610,13 +613,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -639,9 +643,12 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; "OTHER_CFLAGS[arch=*]" = ( "-D_DEBUG", "-Wno-dangling-else", @@ -651,7 +658,6 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Debug; }; @@ -659,9 +665,12 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; "OTHER_CFLAGS[arch=*]" = ( "-DNDEBUG", "-Wno-dangling-else", @@ -671,7 +680,6 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Release; }; diff --git a/smd/macos/smd.xcodeproj/project.pbxproj b/smd/macos/smd.xcodeproj/project.pbxproj index 7f6cee9..6859b18 100644 --- a/smd/macos/smd.xcodeproj/project.pbxproj +++ b/smd/macos/smd.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -447,7 +447,8 @@ E29551F921F618E100336DD3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 2600; ORGANIZATIONNAME = Krzysztof; TargetAttributes = { E295520021F618E100336DD3 = { @@ -476,6 +477,7 @@ /* Begin PBXShellScriptBuildPhase section */ E296564621F8869500BEC8E0 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -602,13 +604,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -662,13 +665,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -691,9 +695,12 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; "OTHER_CFLAGS[arch=*]" = ( "-D_DEBUG", "-Wno-dangling-else", @@ -703,7 +710,6 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Debug; }; @@ -711,9 +717,12 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; "OTHER_CFLAGS[arch=*]" = ( "-DNDEBUG", "-Wno-dangling-else", @@ -723,7 +732,6 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Release; }; diff --git a/smd/q_shared.h b/smd/q_shared.h index 2ae0d7f..552670a 100644 --- a/smd/q_shared.h +++ b/smd/q_shared.h @@ -37,7 +37,9 @@ #undef false #define FAR // needed for jpeglib #define DISABLE_FMOD +#ifndef _mkdir #define _mkdir(a) mkdir(a, 0777) +#endif #endif // __APPLE__ || MACOSX #if defined __linux__ diff --git a/xatrix/macos/xatrix.xcodeproj/project.pbxproj b/xatrix/macos/xatrix.xcodeproj/project.pbxproj index f07c920..e90978f 100644 --- a/xatrix/macos/xatrix.xcodeproj/project.pbxproj +++ b/xatrix/macos/xatrix.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -365,7 +365,8 @@ E29551F921F618E100336DD3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 2600; ORGANIZATIONNAME = Krzysztof; TargetAttributes = { E295520021F618E100336DD3 = { @@ -394,6 +395,7 @@ /* Begin PBXShellScriptBuildPhase section */ E296564621F8869500BEC8E0 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -502,13 +504,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -562,13 +565,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -591,9 +595,12 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; "OTHER_CFLAGS[arch=*]" = ( "-D_DEBUG", "-Wno-dangling-else", @@ -602,7 +609,6 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Debug; }; @@ -610,9 +616,12 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; "OTHER_CFLAGS[arch=*]" = ( "-DNDEBUG", "-Wno-dangling-else", @@ -621,7 +630,6 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Release; }; diff --git a/zaero/macos/zaero.xcodeproj/project.pbxproj b/zaero/macos/zaero.xcodeproj/project.pbxproj index f229ca5..eead6cf 100644 --- a/zaero/macos/zaero.xcodeproj/project.pbxproj +++ b/zaero/macos/zaero.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -418,7 +418,8 @@ E29551F921F618E100336DD3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 2600; ORGANIZATIONNAME = Krzysztof; TargetAttributes = { E295520021F618E100336DD3 = { @@ -447,6 +448,7 @@ /* Begin PBXShellScriptBuildPhase section */ E296564621F8869500BEC8E0 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -566,13 +568,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -626,13 +629,14 @@ 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_STRICT_PROTOTYPES = NO; 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 = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -655,10 +659,13 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ""; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; "OTHER_CFLAGS[arch=*]" = ( "-D_DEBUG", "-Wno-dangling-else", @@ -667,7 +674,6 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Debug; }; @@ -675,9 +681,12 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; + MACOSX_DEPLOYMENT_TARGET = 11.0; + ONLY_ACTIVE_ARCH = NO; "OTHER_CFLAGS[arch=*]" = ( "-DNDEBUG", "-Wno-dangling-else", @@ -686,7 +695,6 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Release; };