pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged

Browse source
This commit is contained in:
Sam Lantinga 2013-06-28 09:53:13 -07:00
commit 0535b41f0c
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Xcode/SDL/pkg-support/SDL.info
View file

@ -1,4 +1,4 @@
Title SDL 1.2.8
Title SDL 2.0.0
Version 1
Description SDL Library for Mac OS X (http://www.libsdl.org)
DefaultLocation /Library/Frameworks

6
include/SDL_hints.h
View file

@ -48,9 +48,9 @@ extern "C" {
#endif
/**
* \brief A variable controlling how 3D acceleration is used to accelerate the SDL 1.2 screen surface.
* \brief A variable controlling how 3D acceleration is used to accelerate the SDL screen surface.
*
* SDL can try to accelerate the SDL 1.2 screen surface by using streaming
* SDL can try to accelerate the SDL screen surface by using streaming
* textures with a 3D rendering engine. This variable controls whether and
* how this is done.
*
@ -107,7 +107,7 @@ extern "C" {
#define SDL_HINT_RENDER_SCALE_QUALITY "SDL_RENDER_SCALE_QUALITY"
/**
* \brief A variable controlling whether updates to the SDL 1.2 screen surface should be synchronized with the vertical refresh, to avoid tearing.
* \brief A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing.
*
* This variable can be set to the following values:
* "0" - Disable vsync

6
include/doxyfile
View file

@ -862,14 +862,14 @@ GENERATE_DOCSET = NO
# documentation sets from a single provider (such as a company or product suite)
# can be grouped.
DOCSET_FEEDNAME = "SDL 1.2 Doxygen"
DOCSET_FEEDNAME = "SDL 2.0 Doxygen"
# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
# should uniquely identify the documentation set bundle. This should be a
# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
# will append .docset to the name.
DOCSET_BUNDLE_ID = org.libsdl.sdl12
DOCSET_BUNDLE_ID = org.libsdl.sdl20
# If the GENERATE_HTMLHELP tag is set to YES, additional index files
# will be generated that can be used as input for tools like the
@ -883,7 +883,7 @@ GENERATE_HTMLHELP = NO
# can add a path in front of the file if the result should not be
# written to the html output directory.
CHM_FILE = ./sdl12.chm
CHM_FILE = ./sdl20.chm
# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
# be used to specify the location (absolute path including file name) of

2
src/events/scancodes_windows.h
View file

@ -21,6 +21,8 @@
#include "../../include/SDL_scancode.h"
/* Windows scancode to SDL scancode mapping table */
/* derived from Microsoft scan code document, http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/scancode.doc */
/* *INDENT-OFF* */
static const SDL_Scancode windows_scancode_table[] =
{