Skip to content

Commit

Permalink
Updated version to 2.0.12 for release candidate build
Browse files Browse the repository at this point in the history
  • Loading branch information
slouken committed Mar 1, 2020
1 parent 6590d07 commit 74ed215
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 15 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Expand Up @@ -42,9 +42,9 @@ include(${SDL2_SOURCE_DIR}/cmake/sdlchecks.cmake)
# set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0. # set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0.
set(SDL_MAJOR_VERSION 2) set(SDL_MAJOR_VERSION 2)
set(SDL_MINOR_VERSION 0) set(SDL_MINOR_VERSION 0)
set(SDL_MICRO_VERSION 11) set(SDL_MICRO_VERSION 12)
set(SDL_INTERFACE_AGE 0) set(SDL_INTERFACE_AGE 0)
set(SDL_BINARY_AGE 11) set(SDL_BINARY_AGE 12)
set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}") set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}")
# the following should match the versions in Xcode project file: # the following should match the versions in Xcode project file:
set(DYLIB_CURRENT_VERSION 12.0.0) set(DYLIB_CURRENT_VERSION 12.0.0)
Expand Down
2 changes: 1 addition & 1 deletion Makefile.os2
Expand Up @@ -2,7 +2,7 @@
# wmake -f Makefile.os2 # wmake -f Makefile.os2


LIBNAME = SDL2 LIBNAME = SDL2
VERSION = 2.0.11 VERSION = 2.0.12
DESCRIPTION = Simple DirectMedia Layer 2 DESCRIPTION = Simple DirectMedia Layer 2


LIBHOME = . LIBHOME = .
Expand Down
4 changes: 2 additions & 2 deletions Xcode/SDL/Info-Framework.plist
Expand Up @@ -19,10 +19,10 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>2.0.11</string> <string>2.0.12</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>SDLX</string> <string>SDLX</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2.0.11</string> <string>2.0.12</string>
</dict> </dict>
</plist> </plist>
2 changes: 1 addition & 1 deletion build-scripts/winrtbuild.ps1
Expand Up @@ -39,7 +39,7 @@
# #


# Base version of SDL, used for packaging purposes # Base version of SDL, used for packaging purposes
$SDLVersion = "2.0.11" $SDLVersion = "2.0.12"


# Gets the .bat file that sets up an MSBuild environment, given one of # Gets the .bat file that sets up an MSBuild environment, given one of
# Visual Studio's, "PlatformToolset"s. # Visual Studio's, "PlatformToolset"s.
Expand Down
4 changes: 2 additions & 2 deletions configure
Expand Up @@ -2817,9 +2817,9 @@ orig_CFLAGS="$CFLAGS"
# #
SDL_MAJOR_VERSION=2 SDL_MAJOR_VERSION=2
SDL_MINOR_VERSION=0 SDL_MINOR_VERSION=0
SDL_MICRO_VERSION=11 SDL_MICRO_VERSION=12
SDL_INTERFACE_AGE=0 SDL_INTERFACE_AGE=0
SDL_BINARY_AGE=11 SDL_BINARY_AGE=12
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION




Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Expand Up @@ -20,9 +20,9 @@ dnl Set various version strings - taken gratefully from the GTk sources
# #
SDL_MAJOR_VERSION=2 SDL_MAJOR_VERSION=2
SDL_MINOR_VERSION=0 SDL_MINOR_VERSION=0
SDL_MICRO_VERSION=11 SDL_MICRO_VERSION=12
SDL_INTERFACE_AGE=0 SDL_INTERFACE_AGE=0
SDL_BINARY_AGE=11 SDL_BINARY_AGE=12
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION


AC_SUBST(SDL_MAJOR_VERSION) AC_SUBST(SDL_MAJOR_VERSION)
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
@@ -1,3 +1,9 @@
libsdl2 (2.0.12) UNRELEASED; urgency=low

* Updated SDL to version 2.0.12 for development builds

-- Sam Lantinga <slouken@libsdl.org> Sun, 1 Mar 2020 14:57:07 -0800

libsdl2 (2.0.11) UNRELEASED; urgency=low libsdl2 (2.0.11) UNRELEASED; urgency=low


* Updated SDL to version 2.0.11 for development builds * Updated SDL to version 2.0.11 for development builds
Expand Down
2 changes: 1 addition & 1 deletion include/SDL_version.h
Expand Up @@ -59,7 +59,7 @@ typedef struct SDL_version
*/ */
#define SDL_MAJOR_VERSION 2 #define SDL_MAJOR_VERSION 2
#define SDL_MINOR_VERSION 0 #define SDL_MINOR_VERSION 0
#define SDL_PATCHLEVEL 11 #define SDL_PATCHLEVEL 12


/** /**
* \brief Macro to determine SDL version program was compiled against. * \brief Macro to determine SDL version program was compiled against.
Expand Down
8 changes: 4 additions & 4 deletions src/main/windows/version.rc
Expand Up @@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //


VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,11,0 FILEVERSION 2,0,12,0
PRODUCTVERSION 2,0,11,0 PRODUCTVERSION 2,0,12,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L FILEFLAGS 0x0L
FILEOS 0x40004L FILEOS 0x40004L
Expand All @@ -23,12 +23,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "\0" VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL\0" VALUE "FileDescription", "SDL\0"
VALUE "FileVersion", "2, 0, 11, 0\0" VALUE "FileVersion", "2, 0, 12, 0\0"
VALUE "InternalName", "SDL\0" VALUE "InternalName", "SDL\0"
VALUE "LegalCopyright", "Copyright � 2020 Sam Lantinga\0" VALUE "LegalCopyright", "Copyright � 2020 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL2.dll\0" VALUE "OriginalFilename", "SDL2.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0" VALUE "ProductName", "Simple DirectMedia Layer\0"
VALUE "ProductVersion", "2, 0, 11, 0\0" VALUE "ProductVersion", "2, 0, 12, 0\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
Expand Down

0 comments on commit 74ed215

Please sign in to comment.