colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-09 10:20:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/narwhal'

Browse Source
This commit is contained in:
Martin Carlberg committed 2024-05-24 12:18:28 +02:00
2 parents c59687b6e2 6d78b9b6df
commit a1e178d0d7
7 files changed
+63 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Tools/XcodeCapp/Jakefile
+2 -2
View File
@@ -24,9 +24,9 @@ task ("build", function()
minorVersion = parseInt(versions[1], 10),
buildVersion = parseInt(versions[2], 10);
if (!((majorVersion == 11) || (majorVersion == 10 && minorVersion >= 12)))
if (!((majorVersion >= 11) || (majorVersion == 10 && minorVersion >= 13)))
{
colorPrint("XcodeCapp requires at least macOS Sierra.", "red");
colorPrint("XcodeCapp requires at least macOS High Sierra.", "red");
p.stdin.close();
p.stdout.close();
Tools/XcodeCapp/XcodeCapp.xcodeproj/project.pbxproj
+8 -8
View File
@@ -444,7 +444,6 @@
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_LOCATION = YES;
DSTROOT = /;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -463,7 +462,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INSTALL_PATH = $USER_APPS_DIR;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@@ -494,7 +493,6 @@
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_LOCATION = YES;
DSTROOT = /;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -506,7 +504,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INSTALL_PATH = $USER_APPS_DIR;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};
@@ -518,11 +516,12 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
DSTROOT = /;
INFOPLIST_FILE = XcodeCapp/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = XcodeCapp;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
INSTALL_PATH = "$(LOCAL_APPS_DIR)";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = org.cappuccino.xcodecapp;
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -534,11 +533,12 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
DSTROOT = /;
INFOPLIST_FILE = XcodeCapp/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = XcodeCapp;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
INSTALL_PATH = "$(LOCAL_APPS_DIR)";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = org.cappuccino.xcodecapp;
PRODUCT_NAME = "$(TARGET_NAME)";
};