From cd1ad69ca0f182696913000669f963e2babb714e Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Thu, 14 Sep 2023 14:31:11 -0400 Subject: [PATCH] version: Bumping to 1.2.66 for release candidate. (Actual release will bump to 1.2.68, and then revision control will go to 1.2.69 for work, next release candidate will be 1.2.70, then 1.2.72, etc.) --- CMakeLists.txt | 4 ++-- include/SDL/SDL_version.h | 2 +- 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 ++++---- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87f594201..1a6578158 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.0.0...3.5) project(sdl12_compat - VERSION 1.2.65 + VERSION 1.2.66 LANGUAGES C) option(SDL12TESTS "Enable to build SDL-1.2 test programs" ON) @@ -33,7 +33,7 @@ if(APPLE) # Xcode project file uses 1.0.0, but it's more compatible to use the # higher version. set(DYLIB_COMPAT_VERSION 12.0.0 CACHE STRING "library compatibility version") - set(DYLIB_CURRENT_VERSION 12.65.0 CACHE STRING "library current version") + set(DYLIB_CURRENT_VERSION 12.66.0 CACHE STRING "library current version") include_directories("/opt/X11/include") # hack. if(CMAKE_VERSION VERSION_LESS 3.9) else() diff --git a/include/SDL/SDL_version.h b/include/SDL/SDL_version.h index 8958db69a..c7347e6ef 100644 --- a/include/SDL/SDL_version.h +++ b/include/SDL/SDL_version.h @@ -33,7 +33,7 @@ real SDL-1.2 available to you. */ /* We bumped the patchlevel to 50 for sdl12-compat */ #define SDL_MAJOR_VERSION 1 #define SDL_MINOR_VERSION 2 -#define SDL_PATCHLEVEL 65 +#define SDL_PATCHLEVEL 66 typedef struct SDL_version { diff --git a/src/Makefile.darwin b/src/Makefile.darwin index a14873332..3c6029222 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.65 +LDFLAGS+= -Wl,-compatibility_version,1.0 -Wl,-current_version,12.66 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 8aaa793a5..86d0fe65a 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.65 +SHLIB = libSDL-1.2.so.1.2.66 OBJ = SDL12_compat.o diff --git a/src/Makefile.os2 b/src/Makefile.os2 index f1498e120..7de161264 100644 --- a/src/Makefile.os2 +++ b/src/Makefile.os2 @@ -5,7 +5,7 @@ !endif DLLNAME = SDL12 -VERSION = 1.2.65 +VERSION = 1.2.66 # change SDL2INC to point to the SDL2 headers SDL2INC = include diff --git a/src/Makefile.w32 b/src/Makefile.w32 index 7860d6343..f91092996 100644 --- a/src/Makefile.w32 +++ b/src/Makefile.w32 @@ -5,7 +5,7 @@ !endif DLLNAME = SDL -VERSION = 1.2.65 +VERSION = 1.2.66 # change SDL2INC to point to the SDL2 headers SDL2INC = include diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c index f089a6908..2752bedad 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 65 +#define SDL12_COMPAT_VERSION 66 #include #include diff --git a/src/version.rc b/src/version.rc index 4abe81eb6..4e6999e29 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,65,0 - PRODUCTVERSION 1,2,65,0 + FILEVERSION 1,2,66,0 + PRODUCTVERSION 1,2,66,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -17,12 +17,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "1, 2, 65, 0\0" + VALUE "FileVersion", "1, 2, 66, 0\0" VALUE "InternalName", "SDL\0" VALUE "LegalCopyright", "Copyright (C) 2022 Sam Lantinga\0" VALUE "OriginalFilename", "SDL.dll\0" VALUE "ProductName", "Simple DirectMedia Layer 1.2 wrapper\0" - VALUE "ProductVersion", "1, 2, 65, 0\0" + VALUE "ProductVersion", "1, 2, 66, 0\0" END END BLOCK "VarFileInfo"