mirror of
				https://github.com/libsdl-org/SDL.git
				synced 2025-11-04 09:44:35 +00:00 
			
		
		
		
	Updated to version 2.0.21 for development
This commit is contained in:
		@@ -66,12 +66,12 @@ 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 20)
 | 
			
		||||
set(SDL_INTERFACE_AGE 2)
 | 
			
		||||
set(SDL_BINARY_AGE 20)
 | 
			
		||||
set(SDL_MICRO_VERSION 21)
 | 
			
		||||
set(SDL_INTERFACE_AGE 3)
 | 
			
		||||
set(SDL_BINARY_AGE 21)
 | 
			
		||||
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 19.2.0)
 | 
			
		||||
set(DYLIB_CURRENT_VERSION 19.3.0)
 | 
			
		||||
set(DYLIB_COMPATIBILITY_VERSION 1.0.0)
 | 
			
		||||
 | 
			
		||||
# Set defaults preventing destination file conflicts
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@
 | 
			
		||||
# wmake -f Makefile.os2 HIDAPI=1
 | 
			
		||||
 | 
			
		||||
LIBNAME = SDL2
 | 
			
		||||
VERSION = 2.0.20
 | 
			
		||||
VERSION = 2.0.21
 | 
			
		||||
DESCRIPTION = Simple DirectMedia Layer 2
 | 
			
		||||
 | 
			
		||||
LIBICONV=0
 | 
			
		||||
 
 | 
			
		||||
@@ -19,10 +19,10 @@
 | 
			
		||||
	<key>CFBundlePackageType</key>
 | 
			
		||||
	<string>FMWK</string>
 | 
			
		||||
	<key>CFBundleShortVersionString</key>
 | 
			
		||||
	<string>2.0.20</string>
 | 
			
		||||
	<string>2.0.21</string>
 | 
			
		||||
	<key>CFBundleSignature</key>
 | 
			
		||||
	<string>SDLX</string>
 | 
			
		||||
	<key>CFBundleVersion</key>
 | 
			
		||||
	<string>2.0.20</string>
 | 
			
		||||
	<string>2.0.21</string>
 | 
			
		||||
</dict>
 | 
			
		||||
</plist>
 | 
			
		||||
 
 | 
			
		||||
@@ -9111,7 +9111,7 @@
 | 
			
		||||
				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 | 
			
		||||
				DEPLOYMENT_POSTPROCESSING = YES;
 | 
			
		||||
				DYLIB_COMPATIBILITY_VERSION = 1.0.0;
 | 
			
		||||
				DYLIB_CURRENT_VERSION = 19.2.0;
 | 
			
		||||
				DYLIB_CURRENT_VERSION = 19.3.0;
 | 
			
		||||
				DYLIB_INSTALL_NAME_BASE = "@rpath";
 | 
			
		||||
				ENABLE_STRICT_OBJC_MSGSEND = YES;
 | 
			
		||||
				GCC_ALTIVEC_EXTENSIONS = YES;
 | 
			
		||||
@@ -9195,7 +9195,7 @@
 | 
			
		||||
				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 | 
			
		||||
				DEBUG_INFORMATION_FORMAT = dwarf;
 | 
			
		||||
				DYLIB_COMPATIBILITY_VERSION = 1.0.0;
 | 
			
		||||
				DYLIB_CURRENT_VERSION = 19.2.0;
 | 
			
		||||
				DYLIB_CURRENT_VERSION = 19.3.0;
 | 
			
		||||
				DYLIB_INSTALL_NAME_BASE = "@rpath";
 | 
			
		||||
				ENABLE_STRICT_OBJC_MSGSEND = YES;
 | 
			
		||||
				ENABLE_TESTABILITY = YES;
 | 
			
		||||
 
 | 
			
		||||
@@ -39,7 +39,7 @@
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
# Base version of SDL, used for packaging purposes
 | 
			
		||||
$SDLVersion = "2.0.20"
 | 
			
		||||
$SDLVersion = "2.0.21"
 | 
			
		||||
 | 
			
		||||
# Gets the .bat file that sets up an MSBuild environment, given one of
 | 
			
		||||
# Visual Studio's, "PlatformToolset"s.
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										6
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								configure
									
									
									
									
										vendored
									
									
								
							@@ -2855,9 +2855,9 @@ orig_CFLAGS="$CFLAGS"
 | 
			
		||||
#
 | 
			
		||||
SDL_MAJOR_VERSION=2
 | 
			
		||||
SDL_MINOR_VERSION=0
 | 
			
		||||
SDL_MICRO_VERSION=20
 | 
			
		||||
SDL_INTERFACE_AGE=2
 | 
			
		||||
SDL_BINARY_AGE=20
 | 
			
		||||
SDL_MICRO_VERSION=21
 | 
			
		||||
SDL_INTERFACE_AGE=3
 | 
			
		||||
SDL_BINARY_AGE=21
 | 
			
		||||
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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=20
 | 
			
		||||
SDL_INTERFACE_AGE=2
 | 
			
		||||
SDL_BINARY_AGE=20
 | 
			
		||||
SDL_MICRO_VERSION=21
 | 
			
		||||
SDL_INTERFACE_AGE=3
 | 
			
		||||
SDL_BINARY_AGE=21
 | 
			
		||||
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
 | 
			
		||||
 | 
			
		||||
AC_SUBST(SDL_MAJOR_VERSION)
 | 
			
		||||
 
 | 
			
		||||
@@ -59,7 +59,7 @@ typedef struct SDL_version
 | 
			
		||||
*/
 | 
			
		||||
#define SDL_MAJOR_VERSION   2
 | 
			
		||||
#define SDL_MINOR_VERSION   0
 | 
			
		||||
#define SDL_PATCHLEVEL      20
 | 
			
		||||
#define SDL_PATCHLEVEL      21
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Macro to determine SDL version program was compiled against.
 | 
			
		||||
 
 | 
			
		||||
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 | 
			
		||||
//
 | 
			
		||||
 | 
			
		||||
VS_VERSION_INFO VERSIONINFO
 | 
			
		||||
 FILEVERSION 2,0,20,0
 | 
			
		||||
 PRODUCTVERSION 2,0,20,0
 | 
			
		||||
 FILEVERSION 2,0,21,0
 | 
			
		||||
 PRODUCTVERSION 2,0,21,0
 | 
			
		||||
 FILEFLAGSMASK 0x3fL
 | 
			
		||||
 FILEFLAGS 0x0L
 | 
			
		||||
 FILEOS 0x40004L
 | 
			
		||||
@@ -23,12 +23,12 @@ BEGIN
 | 
			
		||||
        BEGIN
 | 
			
		||||
            VALUE "CompanyName", "\0"
 | 
			
		||||
            VALUE "FileDescription", "SDL\0"
 | 
			
		||||
            VALUE "FileVersion", "2, 0, 20, 0\0"
 | 
			
		||||
            VALUE "FileVersion", "2, 0, 21, 0\0"
 | 
			
		||||
            VALUE "InternalName", "SDL\0"
 | 
			
		||||
            VALUE "LegalCopyright", "Copyright (C) 2022 Sam Lantinga\0"
 | 
			
		||||
            VALUE "OriginalFilename", "SDL2.dll\0"
 | 
			
		||||
            VALUE "ProductName", "Simple DirectMedia Layer\0"
 | 
			
		||||
            VALUE "ProductVersion", "2, 0, 20, 0\0"
 | 
			
		||||
            VALUE "ProductVersion", "2, 0, 21, 0\0"
 | 
			
		||||
        END
 | 
			
		||||
    END
 | 
			
		||||
    BLOCK "VarFileInfo"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user