Skip to content

Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit

Fixes issue caused by stupidity that disabled liquid glass

NotProtonNotd8f2d3864714
diff --git a/Makefile b/Makefile
index 7499acb..23bed07 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
CC := clang
ARCH := arm64
MIN_VER := 15.0
+GLASS_SDK := 26.0
AVAIL := -Werror=unguarded-availability-new
CFLAGS := -arch $(ARCH) -mmacosx-version-min=$(MIN_VER) $(AVAIL) \
@@ -127,7 +128,7 @@ launchercheck:
.PHONY: mincheck
mincheck:
- @sh dylib/tests/mincheck.sh "$(APP_BUNDLE)" "$(MIN_VER)"
+ @sh dylib/tests/mincheck.sh "$(APP_BUNDLE)" "$(MIN_VER)" "$(GLASS_SDK)"
# runcheck owns compat_run.sh, whose warnings wait for a change that can move
# the embedded __text baseline
@@ -594,6 +595,9 @@ app: app-payload $(ICON_CAR)
"$(APP_BUNDLE)/Contents/Frameworks/Sparkle.framework"
install_name_tool -add_rpath @executable_path/../Frameworks \
"$(APP_BUNDLE)/Contents/MacOS/NotProtonApp"
+ xcrun vtool -set-build-version macos $(MIN_VER) "$$(xcrun --sdk macosx --show-sdk-version)" \
+ -replace -output "$(APP_BUNDLE)/Contents/MacOS/NotProtonApp" \
+ "$(APP_BUNDLE)/Contents/MacOS/NotProtonApp"
cp -R "$$(swift build --package-path app -c release --show-bin-path)/NotProtonApp_NotProtonApp.bundle" \
"$(APP_BUNDLE)/Contents/Resources/"
cp "$(ICON_DIR)/Assets.car" "$(ICON_DIR)/NotProton.icns" \
diff --git a/dylib/tests/mincheck.sh b/dylib/tests/mincheck.sh
index ebdbc98..2f17080 100644
--- a/dylib/tests/mincheck.sh
+++ b/dylib/tests/mincheck.sh
@@ -3,6 +3,7 @@ set -eu
app="$1"
min="$2"
+sdk="$3"
[ -d "$app" ] || { echo "mincheck: $app not found"; exit 1; }
@@ -42,6 +43,13 @@ while IFS= read -r f; do
done
done < "$list"
+main="$app/Contents/MacOS/$(/usr/libexec/PlistBuddy -c 'Print :CFBundleExecutable' "$app/Contents/Info.plist")"
+built=$(xcrun vtool -show-build "$main" 2>/dev/null | awk '$1 == "sdk" { print $2; exit }')
+if [ -z "$built" ] || newer "$sdk" "$built"; then
+ echo " built against SDK ${built:-unknown}, below $sdk: ${main#"$app"/}"
+ bad=1
+fi
+
[ "$checked" -gt 0 ] || { echo "mincheck: no Mach-O files in $app"; exit 1; }
-[ "$bad" -eq 0 ] || { echo "==> mincheck: binaries above macOS $min"; exit 1; }
+[ "$bad" -eq 0 ] || { echo "==> mincheck: failed"; exit 1; }
echo "==> mincheck: $checked binaries run on macOS $min"