Commit 3f6ebffff4c7e89a9199ac68b0324e00bffe338d
2021-08-10T15:02:36
Updated to version 2.0.17 for development
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17f0a5f..d68d2c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,9 +51,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 16)
-set(SDL_INTERFACE_AGE 0)
-set(SDL_BINARY_AGE 16)
+set(SDL_MICRO_VERSION 17)
+set(SDL_INTERFACE_AGE 1)
+set(SDL_BINARY_AGE 17)
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 17.0.0)
diff --git a/Makefile.os2 b/Makefile.os2
index b7b13aa..8f861e6 100644
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -2,7 +2,7 @@
# wmake -f Makefile.os2
LIBNAME = SDL2
-VERSION = 2.0.16
+VERSION = 2.0.17
DESCRIPTION = Simple DirectMedia Layer 2
LIBHOME = .
diff --git a/Xcode/SDL/Info-Framework.plist b/Xcode/SDL/Info-Framework.plist
index a2a7537..5a9c238 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.16</string>
+ <string>2.0.17</string>
<key>CFBundleSignature</key>
<string>SDLX</string>
<key>CFBundleVersion</key>
- <string>2.0.16</string>
+ <string>2.0.17</string>
</dict>
</plist>
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index d1cb8dc..854f5e1 100644
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -10161,7 +10161,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_LINK_OBJC_RUNTIME = NO;
- MARKETING_VERSION = 2.0.16;
+ MARKETING_VERSION = 2.0.17;
OTHER_LDFLAGS = "-liconv";
};
name = Release;
@@ -10246,7 +10246,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_LINK_OBJC_RUNTIME = NO;
- MARKETING_VERSION = 2.0.16;
+ MARKETING_VERSION = 2.0.17;
OTHER_LDFLAGS = "-liconv";
};
name = Debug;
diff --git a/build-scripts/winrtbuild.ps1 b/build-scripts/winrtbuild.ps1
index 0b010b1..d5ceb99 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.16"
+$SDLVersion = "2.0.17"
# Gets the .bat file that sets up an MSBuild environment, given one of
# Visual Studio's, "PlatformToolset"s.
diff --git a/configure b/configure
index ce25059..2abff57 100755
--- a/configure
+++ b/configure
@@ -2838,9 +2838,9 @@ orig_CFLAGS="$CFLAGS"
#
SDL_MAJOR_VERSION=2
SDL_MINOR_VERSION=0
-SDL_MICRO_VERSION=16
-SDL_INTERFACE_AGE=0
-SDL_BINARY_AGE=16
+SDL_MICRO_VERSION=17
+SDL_INTERFACE_AGE=1
+SDL_BINARY_AGE=17
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
diff --git a/configure.ac b/configure.ac
index 8076f92..5029256 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@ dnl Set various version strings - taken gratefully from the GTk sources
#
SDL_MAJOR_VERSION=2
SDL_MINOR_VERSION=0
-SDL_MICRO_VERSION=16
-SDL_INTERFACE_AGE=0
-SDL_BINARY_AGE=16
+SDL_MICRO_VERSION=17
+SDL_INTERFACE_AGE=1
+SDL_BINARY_AGE=17
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 feeaebf..0d14cfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libsdl2 (2.0.17) UNRELEASED; urgency=low
+
+ * Updated SDL to version 2.0.17
+
+ -- Sam Lantinga <slouken@libsdl.org> Tue, 10 Aug 2021 15:00:14 -0800
+
libsdl2 (2.0.16) UNRELEASED; urgency=low
* Updated SDL to version 2.0.16
diff --git a/include/SDL_version.h b/include/SDL_version.h
index f4f8be2..5fddb48 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 16
+#define SDL_PATCHLEVEL 17
/**
* Macro to determine SDL version program was compiled against.
diff --git a/src/main/windows/version.rc b/src/main/windows/version.rc
index 2ce9cf0..f473c15 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,16,0
- PRODUCTVERSION 2,0,16,0
+ FILEVERSION 2,0,17,0
+ PRODUCTVERSION 2,0,17,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL\0"
- VALUE "FileVersion", "2, 0, 16, 0\0"
+ VALUE "FileVersion", "2, 0, 17, 0\0"
VALUE "InternalName", "SDL\0"
VALUE "LegalCopyright", "Copyright (C) 2021 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL2.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
- VALUE "ProductVersion", "2, 0, 16, 0\0"
+ VALUE "ProductVersion", "2, 0, 17, 0\0"
END
END
BLOCK "VarFileInfo"