From 5cd641b08f6672ca996e4883254263fbc045247f Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Thu, 3 Aug 2023 21:55:10 +0300
Subject: [PATCH] Makefile.w32 doesn't need a version
---
build-scripts/test-versioning.sh | 8 --------
build-scripts/update-version.sh | 2 --
src/Makefile.w32 | 3 +--
3 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/build-scripts/test-versioning.sh b/build-scripts/test-versioning.sh
index 493db1c..41b1607 100755
--- a/build-scripts/test-versioning.sh
+++ b/build-scripts/test-versioning.sh
@@ -67,14 +67,6 @@ else
not_ok "version.rc ProductVersion $tuple disagrees with SDL_version.h $ref_tuple"
fi
-version=$(sed -Ene 's/^VERSION = ([0-9.]+)$/\1/p' src/Makefile.w32)
-
-if [ "$ref_version" = "$version" ]; then
- ok "Makefile.w32 $version"
-else
- not_ok "Makefile.w32 $version disagrees with SDL_version.h $ref_version"
-fi
-
minor=$(sed -Ene 's/^#define SDL2_COMPAT_VERSION_MINOR ([0-9]+)$/\1/p' src/sdl2_compat.c)
if [ "$ref_minor" = "$minor" ]; then
diff --git a/build-scripts/update-version.sh b/build-scripts/update-version.sh
index b525e5b..ad8001b 100755
--- a/build-scripts/update-version.sh
+++ b/build-scripts/update-version.sh
@@ -38,8 +38,6 @@ perl -w -pi -e 's/(PRODUCTVERSION\s+)\d+,\d+,\d+/${1}'${MAJOR}','${MINOR}','${PA
perl -w -pi -e 's/(VALUE "FileVersion", ")\d+, \d+, \d+/${1}'${MAJOR}', '${MINOR}', '${PATCH}'/;' src/version.rc
perl -w -pi -e 's/(VALUE "ProductVersion", ")\d+, \d+, \d+/${1}'${MAJOR}', '${MINOR}', '${PATCH}'/;' src/version.rc
-perl -w -pi -e 's/(VERSION\s+=\s+)\d+.\d+.\d+/${1}'${MAJOR}'.'${MINOR}'.'${PATCH}'/;' src/Makefile.w32
-
perl -w -pi -e 's/(\#define SDL2_COMPAT_VERSION_MINOR\s+)\d+/${1}'${MINOR}'/;' src/sdl2_compat.c
perl -w -pi -e 's/(\#define SDL2_COMPAT_VERSION_PATCH\s+)\d+/${1}'${PATCH}'/;' src/sdl2_compat.c
diff --git a/src/Makefile.w32 b/src/Makefile.w32
index f3db753..d440633 100644
--- a/src/Makefile.w32
+++ b/src/Makefile.w32
@@ -5,7 +5,6 @@
!endif
DLLNAME = SDL2
-VERSION = 2.28.50
# change SDL2INC to point to the SDL2 headers
SDL2INC = include
@@ -77,7 +76,7 @@ $(LNKFILE):
@%append $@ OPTION SHOWDEAD
clean: .SYMBOLIC
- @echo * Clean: $(LIBNAME) $(VERSION)
+ @echo * Clean: $(LIBNAME)
@if exist *.obj rm *.obj
@if exist *.res rm *.res
@if exist *.lbc rm *.lbc