Skip to content

Commit

Permalink
version: Bumping to 1.2.62 for release candidate.
Browse files Browse the repository at this point in the history
(Actual release will bump to 1.2.64, and then revision control will go
to 1.2.65 for work, next release candidate will be 1.2.66, then 1.2.68, etc.)
  • Loading branch information
icculus committed May 18, 2023
1 parent 82b9b50 commit 59e3eb9
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

cmake_minimum_required(VERSION 3.0.0)
project(sdl12_compat
VERSION 1.2.61
VERSION 1.2.62
LANGUAGES C)

option(SDL12TESTS "Enable to build SDL-1.2 test programs" ON)
Expand Down Expand Up @@ -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.61.0 CACHE STRING "library current version")
set(DYLIB_CURRENT_VERSION 12.62.0 CACHE STRING "library current version")
include_directories("/opt/X11/include") # hack.
if(CMAKE_VERSION VERSION_LESS 3.9)
else()
Expand Down
2 changes: 1 addition & 1 deletion include/SDL/SDL_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 61
#define SDL_PATCHLEVEL 62

typedef struct SDL_version
{
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.darwin
Original file line number Diff line number Diff line change
Expand Up @@ -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.61
LDFLAGS+= -Wl,-compatibility_version,1.0 -Wl,-current_version,12.62
LDLIBS = -Wl,-framework,AppKit
# this is needed for x86_64 - cross-gcc might not add it.
#LDLIBS += -Wl,-lbundle1.o
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -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.61
SHLIB = libSDL-1.2.so.1.2.62

OBJ = SDL12_compat.o

Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.os2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
!endif

DLLNAME = SDL12
VERSION = 1.2.61
VERSION = 1.2.62

# change SDL2INC to point to the SDL2 headers
SDL2INC = include
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.w32
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
!endif

DLLNAME = SDL
VERSION = 1.2.61
VERSION = 1.2.62

# change SDL2INC to point to the SDL2 headers
SDL2INC = include
Expand Down
2 changes: 1 addition & 1 deletion src/SDL12_compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 61
#define SDL12_COMPAT_VERSION 62

#include <stdarg.h>
#include <limits.h>
Expand Down
8 changes: 4 additions & 4 deletions src/version.rc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,2,61,0
PRODUCTVERSION 1,2,61,0
FILEVERSION 1,2,62,0
PRODUCTVERSION 1,2,62,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
Expand All @@ -17,12 +17,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL\0"
VALUE "FileVersion", "1, 2, 61, 0\0"
VALUE "FileVersion", "1, 2, 62, 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, 61, 0\0"
VALUE "ProductVersion", "1, 2, 62, 0\0"
END
END
BLOCK "VarFileInfo"
Expand Down

0 comments on commit 59e3eb9

Please sign in to comment.