From 3cf303adb3465a387ae368139bb6360d0675ea73 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 30 May 2021 11:08:52 -0300 Subject: [PATCH] macOS: build for arm64+x64. Remove obsolete linker flags needed for LuaJIT 2.0. --- .../xcode/liblove.xcodeproj/project.pbxproj | 3 --- platform/xcode/love.xcodeproj/project.pbxproj | 24 ------------------- 2 files changed, 27 deletions(-) diff --git a/platform/xcode/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj index 1402adaa6..1561c20b1 100644 --- a/platform/xcode/liblove.xcodeproj/project.pbxproj +++ b/platform/xcode/liblove.xcodeproj/project.pbxproj @@ -5277,7 +5277,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = x86_64; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 9.0; @@ -5318,7 +5317,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = x86_64; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 9.0; DYLIB_CURRENT_VERSION = 9.0; @@ -5358,7 +5356,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = x86_64; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 9.0; diff --git a/platform/xcode/love.xcodeproj/project.pbxproj b/platform/xcode/love.xcodeproj/project.pbxproj index 4c2aea0a7..147012501 100644 --- a/platform/xcode/love.xcodeproj/project.pbxproj +++ b/platform/xcode/love.xcodeproj/project.pbxproj @@ -436,7 +436,6 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = "OS X AppIcon"; CODE_SIGN_ENTITLEMENTS = love.entitlements; CODE_SIGN_IDENTITY = ""; @@ -467,7 +466,6 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = "OS X AppIcon"; CODE_SIGN_ENTITLEMENTS = love.entitlements; CODE_SIGN_IDENTITY = ""; @@ -557,13 +555,6 @@ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ""; - "OTHER_LDFLAGS[arch=x86_64]" = ( - "-pagezero_size", - 10000, - "-image_base", - 100000000, - ); PRODUCT_NAME = love; SDKROOT = macosx; WARNING_CFLAGS = ( @@ -639,13 +630,6 @@ LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = NO; - OTHER_LDFLAGS = ""; - "OTHER_LDFLAGS[arch=x86_64]" = ( - "-pagezero_size", - 10000, - "-image_base", - 100000000, - ); PRODUCT_NAME = love; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SDKROOT = macosx; @@ -870,13 +854,6 @@ LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = NO; - OTHER_LDFLAGS = ""; - "OTHER_LDFLAGS[arch=x86_64]" = ( - "-pagezero_size", - 10000, - "-image_base", - 100000000, - ); PRODUCT_NAME = love; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SDKROOT = macosx; @@ -890,7 +867,6 @@ FA5326C718971A0900F7BBF4 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = "OS X AppIcon"; CODE_SIGN_ENTITLEMENTS = love.entitlements; CODE_SIGN_IDENTITY = "";