From ae0fb29ed345253de396cee9c75b1285797742dd Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Fri, 2 Sep 2022 12:32:00 -0400
Subject: [PATCH] version: Bumping to 1.2.54 for release candidate.
(Actual release will bump to 1.2.56, and then revision control will go
to 1.2.57 for work, next release candidate will be 1.2.58, the 1.2.60, etc.)
---
CMakeLists.txt | 4 ++--
src/Makefile.darwin | 2 +-
src/Makefile.linux | 2 +-
src/Makefile.os2 | 2 +-
src/Makefile.w32 | 2 +-
src/SDL12_compat.c | 2 +-
src/version.rc | 8 ++++----
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa40e3616..ca88d6814 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
cmake_minimum_required(VERSION 3.0.0)
project(sdl12_compat
- VERSION 1.2.53
+ VERSION 1.2.54
LANGUAGES C)
option(SDL12TESTS "Enable to build SDL-1.2 test programs" ON)
@@ -22,7 +22,7 @@ if(APPLE)
set_source_files_properties(${OSX_SRCS} PROPERTIES LANGUAGE C)
# the following matches SDL-1.2 Xcode project file
set(DYLIB_COMPAT_VERSION 1.0.0 CACHE STRING "library compatibility version")
- set(DYLIB_CURRENT_VERSION 12.53.0 CACHE STRING "library current version")
+ set(DYLIB_CURRENT_VERSION 12.54.0 CACHE STRING "library current version")
include_directories("/opt/X11/include") # hack.
if(CMAKE_VERSION VERSION_LESS 3.9)
else()
diff --git a/src/Makefile.darwin b/src/Makefile.darwin
index 7d4e81992..07e3caa94 100644
--- a/src/Makefile.darwin
+++ b/src/Makefile.darwin
@@ -18,7 +18,7 @@ CFLAGS = -mmacosx-version-min=10.6 -fPIC -O3 -Wall
LDFLAGS = -mmacosx-version-min=10.6 -dynamiclib -Wl,-undefined,error -Wl,-single_module
#LDFLAGS+= -Wl,-headerpad_max_install_names
LDFLAGS+= -Wl,-install_name,"/usr/local/lib/$(DYLIB)"
-LDFLAGS+= -Wl,-compatibility_version,1.0 -Wl,-current_version,12.53
+LDFLAGS+= -Wl,-compatibility_version,1.0 -Wl,-current_version,12.54
LDLIBS = -Wl,-framework,AppKit
# this is needed for x86_64 - cross-gcc might not add it.
#LDLIBS += -Wl,-lbundle1.o
diff --git a/src/Makefile.linux b/src/Makefile.linux
index def560386..2fecd5cdd 100644
--- a/src/Makefile.linux
+++ b/src/Makefile.linux
@@ -16,7 +16,7 @@ LDFLAGS = -shared -Wl,-soname,libSDL-1.2.so.0
LDFLAGS+= -Wl,--no-undefined
LDLIBS = -ldl
-SHLIB = libSDL-1.2.so.1.2.53
+SHLIB = libSDL-1.2.so.1.2.54
OBJ = SDL12_compat.o
diff --git a/src/Makefile.os2 b/src/Makefile.os2
index 2d71d50d2..4f8a2ea1b 100644
--- a/src/Makefile.os2
+++ b/src/Makefile.os2
@@ -5,7 +5,7 @@
!endif
DLLNAME = SDL12
-VERSION = 1.2.53
+VERSION = 1.2.54
# change SDL2INC to point to the SDL2 headers
SDL2INC = include
diff --git a/src/Makefile.w32 b/src/Makefile.w32
index 0585d17e5..adf54a867 100644
--- a/src/Makefile.w32
+++ b/src/Makefile.w32
@@ -5,7 +5,7 @@
!endif
DLLNAME = SDL
-VERSION = 1.2.53
+VERSION = 1.2.54
# change SDL2INC to point to the SDL2 headers
SDL2INC = include
diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c
index 996e9c767..b893833e4 100644
--- a/src/SDL12_compat.c
+++ b/src/SDL12_compat.c
@@ -28,7 +28,7 @@
* should be way ahead of what SDL-1.2 Classic would report, so apps can
* decide if they're running under the compat layer, if they really care.
*/
-#define SDL12_COMPAT_VERSION 53
+#define SDL12_COMPAT_VERSION 54
#include <stdarg.h>
#include <limits.h>
diff --git a/src/version.rc b/src/version.rc
index 9bd5627f5..81cc8db0a 100644
--- a/src/version.rc
+++ b/src/version.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,53,0
- PRODUCTVERSION 1,2,53,0
+ FILEVERSION 1,2,54,0
+ PRODUCTVERSION 1,2,54,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
@@ -17,12 +17,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL\0"
- VALUE "FileVersion", "1, 2, 53, 0\0"
+ VALUE "FileVersion", "1, 2, 54, 0\0"
VALUE "InternalName", "SDL\0"
VALUE "LegalCopyright", "Copyright 2022 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer 1.2 wrapper\0"
- VALUE "ProductVersion", "1, 2, 53, 0\0"
+ VALUE "ProductVersion", "1, 2, 54, 0\0"
END
END
BLOCK "VarFileInfo"