diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Makefile.os2 | 2 | ||||
| -rw-r--r-- | Xcode/SDL/Info-Framework.plist | 4 | ||||
| -rw-r--r-- | build-scripts/winrtbuild.ps1 | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | include/SDL_version.h | 2 | ||||
| -rw-r--r-- | src/main/windows/version.rc | 8 |
9 files changed, 21 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5794911ef..7dfd35389 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,9 +42,9 @@ include(${SDL2_SOURCE_DIR}/cmake/sdlchecks.cmake) # set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0. set(SDL_MAJOR_VERSION 2) set(SDL_MINOR_VERSION 0) -set(SDL_MICRO_VERSION 11) +set(SDL_MICRO_VERSION 12) 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}") # the following should match the versions in Xcode project file: set(DYLIB_CURRENT_VERSION 12.0.0) diff --git a/Makefile.os2 b/Makefile.os2 index 700662577..7fa55d74b 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -2,7 +2,7 @@ # wmake -f Makefile.os2 LIBNAME = SDL2 -VERSION = 2.0.11 +VERSION = 2.0.12 DESCRIPTION = Simple DirectMedia Layer 2 LIBHOME = . diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist index ae10c18d7..9828759a5 100644 --- a/Xcode/SDL/Info-Framework.plist +++ b/Xcode/SDL/Info-Framework.plist @@ -19,10 +19,10 @@ <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleShortVersionString</key> - <string>2.0.11</string> + <string>2.0.12</string> <key>CFBundleSignature</key> <string>SDLX</string> <key>CFBundleVersion</key> - <string>2.0.11</string> + <string>2.0.12</string> </dict> </plist> diff --git a/build-scripts/winrtbuild.ps1 b/build-scripts/winrtbuild.ps1 index 36db8056e..214b751ef 100644 --- a/build-scripts/winrtbuild.ps1 +++ b/build-scripts/winrtbuild.ps1 @@ -39,7 +39,7 @@ #
# 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
# Visual Studio's, "PlatformToolset"s.
@@ -2817,9 +2817,9 @@ orig_CFLAGS="$CFLAGS" # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=11 +SDL_MICRO_VERSION=12 SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=11 +SDL_BINARY_AGE=12 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION diff --git a/configure.ac b/configure.ac index fe43e5fc0..7ace411a7 100644 --- a/configure.ac +++ b/configure.ac @@ -20,9 +20,9 @@ dnl Set various version strings - taken gratefully from the GTk sources # SDL_MAJOR_VERSION=2 SDL_MINOR_VERSION=0 -SDL_MICRO_VERSION=11 +SDL_MICRO_VERSION=12 SDL_INTERFACE_AGE=0 -SDL_BINARY_AGE=11 +SDL_BINARY_AGE=12 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION AC_SUBST(SDL_MAJOR_VERSION) diff --git a/debian/changelog b/debian/changelog index 9056b2a80..76f6ae592 100644 --- a/debian/changelog +++ b/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 * Updated SDL to version 2.0.11 for development builds diff --git a/include/SDL_version.h b/include/SDL_version.h index 3fa630658..c824b1d31 100644 --- a/include/SDL_version.h +++ b/include/SDL_version.h @@ -59,7 +59,7 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 11 +#define SDL_PATCHLEVEL 12 /** * \brief Macro to determine SDL version program was compiled against. diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc index 77eed019c..f188494c9 100644 --- a/src/main/windows/version.rc +++ b/src/main/windows/version.rc @@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US //
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,11,0
- PRODUCTVERSION 2,0,11,0
+ FILEVERSION 2,0,12,0
+ PRODUCTVERSION 2,0,12,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL\0"
- VALUE "FileVersion", "2, 0, 11, 0\0"
+ VALUE "FileVersion", "2, 0, 12, 0\0"
VALUE "InternalName", "SDL\0"
VALUE "LegalCopyright", "Copyright © 2020 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL2.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
- VALUE "ProductVersion", "2, 0, 11, 0\0"
+ VALUE "ProductVersion", "2, 0, 12, 0\0"
END
END
BLOCK "VarFileInfo"
|