Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Updated SDL to version 2.0.1
- Loading branch information
|
@@ -29,9 +29,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 0) |
|
|
set(SDL_MICRO_VERSION 1) |
|
|
set(SDL_INTERFACE_AGE 0) |
|
|
set(SDL_BINARY_AGE 0) |
|
|
set(SDL_BINARY_AGE 1) |
|
|
set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}") |
|
|
|
|
|
# Calculate a libtool-like version number |
|
|
|
@@ -4,6 +4,8 @@ |
|
|
<dict> |
|
|
<key>CFBundleDevelopmentRegion</key> |
|
|
<string>English</string> |
|
|
<key>CFBundleExecutable</key> |
|
|
<string>${EXECUTABLE_NAME}</string> |
|
|
<key>CFBundleGetInfoString</key> |
|
|
<string>http://www.libsdl.org</string> |
|
|
<key>CFBundleIconFile</key> |
|
@@ -17,12 +19,10 @@ |
|
|
<key>CFBundlePackageType</key> |
|
|
<string>FMWK</string> |
|
|
<key>CFBundleShortVersionString</key> |
|
|
<string>2.0.0</string> |
|
|
<string>2.0.1</string> |
|
|
<key>CFBundleSignature</key> |
|
|
<string>SDLX</string> |
|
|
<key>CFBundleVersion</key> |
|
|
<string>2.0.0</string> |
|
|
<key>CFBundleExecutable</key> |
|
|
<string>${EXECUTABLE_NAME}</string> |
|
|
<string>2.0.1</string> |
|
|
</dict> |
|
|
</plist> |
|
@@ -2660,9 +2660,9 @@ orig_CFLAGS="$CFLAGS" |
|
|
# |
|
|
SDL_MAJOR_VERSION=2 |
|
|
SDL_MINOR_VERSION=0 |
|
|
SDL_MICRO_VERSION=0 |
|
|
SDL_MICRO_VERSION=1 |
|
|
SDL_INTERFACE_AGE=0 |
|
|
SDL_BINARY_AGE=0 |
|
|
SDL_BINARY_AGE=1 |
|
|
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION |
|
|
|
|
|
|
|
|
|
@@ -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=0 |
|
|
SDL_MICRO_VERSION=1 |
|
|
SDL_INTERFACE_AGE=0 |
|
|
SDL_BINARY_AGE=0 |
|
|
SDL_BINARY_AGE=1 |
|
|
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 0 |
|
|
#define SDL_PATCHLEVEL 1 |
|
|
|
|
|
/** |
|
|
* \brief 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,0,0 |
|
|
PRODUCTVERSION 2,0,0,0 |
|
|
FILEVERSION 2,0,1,0 |
|
|
PRODUCTVERSION 2,0,1,0 |
|
|
FILEFLAGSMASK 0x3fL |
|
|
FILEFLAGS 0x0L |
|
|
FILEOS 0x40004L |
|
@@ -23,12 +23,12 @@ BEGIN |
|
|
BEGIN |
|
|
VALUE "CompanyName", "\0" |
|
|
VALUE "FileDescription", "SDL\0" |
|
|
VALUE "FileVersion", "2, 0, 0, 0\0" |
|
|
VALUE "FileVersion", "2, 0, 1, 0\0" |
|
|
VALUE "InternalName", "SDL\0" |
|
|
VALUE "LegalCopyright", "Copyright � 2013 Sam Lantinga\0" |
|
|
VALUE "OriginalFilename", "SDL.dll\0" |
|
|
VALUE "OriginalFilename", "SDL2.dll\0" |
|
|
VALUE "ProductName", "Simple DirectMedia Layer\0" |
|
|
VALUE "ProductVersion", "2, 0, 0, 0\0" |
|
|
VALUE "ProductVersion", "2, 0, 1, 0\0" |
|
|
END |
|
|
END |
|
|
BLOCK "VarFileInfo" |
|
|
|
@@ -3452,7 +3452,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
|
|
rm -f conf.sdltest |
|
|
|
|
|
CFLAGS="$CFLAGS $SDL_CFLAGS" |
|
|
LIBS="$LIBS $SDL_LIBS -lSDL2_test" |
|
|
LIBS="$LIBS $SDL_LIBS -lSDL2_test" |
|
|
|
|
|
ac_ext=c |
|
|
ac_cpp='$CPP $CPPFLAGS' |
|
|