fixes for plist

Author: johnzhou721

MacCatalyst/Resources/Info.plist.in

@@ -26,10 +26,10 @@
 	<string>%VERSION%</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
-		<string>MacCatalyst</string>
+		<string>MacOSX</string>
 	</array>
 	<key>LSMinimumSystemVersion</key>
-	<string>11.0</string>
+	<string>@CATALYST_MACOS_VERSION@</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>2</integer>

MacCatalyst/Resources/dylib-Info-template.plist

@@ -16,10 +16,10 @@
 	<string>1.0</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
-		<string>MacCatalyst</string>
+		<string>MacOSX</string>
 	</array>
 	<key>LSMinimumSystemVersion</key>
-	<string>11.0</string>
+	<string>11.2</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>2</integer>

MacCatalyst/testbed/CatalystTestbed/dylib-Info-template.plist

@@ -11,15 +11,19 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
-	<string>APPL</string>
+	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
-		<string>iPhoneOS</string>
+		<string>MacOSX</string>
+	</array>
+	<key>LSMinimumSystemVersion</key>
+	<string>11.2</string>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>2</integer>
 	</array>
-	<key>MinimumOSVersion</key>
-	<string>12.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

configure

@@ -890,6 +890,31 @@ AC_ARG_WITH(
 ])
 AC_SUBST([APP_STORE_COMPLIANCE_PATCH])
 
+
+AC_ARG_WITH([catalyst-macos-version],
+  [AS_HELP_STRING([--with-catalyst-macos-version=VER],
+  [The minimum macOS version a Catalyst build can run on (only valid for *-apple-ios*-macabi targets)])],
+  [case "$host" in
+    *-apple-ios*-macabi)
+      CATALYST_MACOS_VERSION="$withval"
+      ;;
+    *)
+      AC_MSG_ERROR([--with-catalyst-macos-version is only valid when targeting Mac Catalyst (*-apple-ios*-macabi).])
+      ;;
+  ],
+  [case "$host" in
+    *-apple-ios*-macabi)
+      CATALYST_MACOS_VERSION=11.2
+      ;;
+    *)
+      CATALYST_MACOS_VERSION=
+      ;;
+  ]
+)
+
+
+
+
 EXPORT_XROS_DEPLOYMENT_TARGET='#'
 
 AC_SUBST([_PYTHON_HOST_PLATFORM])
@@ -915,7 +940,7 @@ if test "$cross_compiling" = yes; then
 		# IPHONEOS_DEPLOYMENT_TARGET is the minimum supported iOS version
 		AC_MSG_CHECKING([iOS deployment target])
 		IPHONEOS_DEPLOYMENT_TARGET=$(echo ${_host_os} | cut -c4-)
-		IPHONEOS_DEPLOYMENT_TARGET=${IPHONEOS_DEPLOYMENT_TARGET:=14.0}  # else it returns invalid version number
+		IPHONEOS_DEPLOYMENT_TARGET=${IPHONEOS_DEPLOYMENT_TARGET:=14.2}  # else it returns invalid version number
 		AC_MSG_RESULT([$IPHONEOS_DEPLOYMENT_TARGET])
 
 		case "$host_cpu" in
@@ -1176,6 +1201,10 @@ AC_SUBST([XROS_DEPLOYMENT_TARGET])
 # XROS_DEPLOYMENT_TARGET should get exported
 AC_SUBST([EXPORT_XROS_DEPLOYMENT_TARGET])
 
+# The minimum macOS version that a Mac Catalyst build can run on.
+AC_SUBST([CATALYST_MACOS_VERSION])
+
+
 # checks for alternative programs
 
 # compiler flags are generated in two sets, BASECFLAGS and OPT.  OPT is just