Merged
authorSam Lantinga <slouken@libsdl.org>
Fri, 28 Jun 2013 09:53:13 -0700
changeset 733133c15a2ec5e7
parent 7330 95a9e82b5414
parent 7329 e8c4d743dd83
child 7333 b74f920d964e
Merged
     1.1 --- a/Xcode/SDL/pkg-support/SDL.info	Fri Jun 28 09:52:36 2013 -0700
     1.2 +++ b/Xcode/SDL/pkg-support/SDL.info	Fri Jun 28 09:53:13 2013 -0700
     1.3 @@ -1,4 +1,4 @@
     1.4 -Title SDL 1.2.8
     1.5 +Title SDL 2.0.0
     1.6  Version 1
     1.7  Description SDL Library for Mac OS X (http://www.libsdl.org)
     1.8  DefaultLocation /Library/Frameworks
     2.1 --- a/include/SDL_hints.h	Fri Jun 28 09:52:36 2013 -0700
     2.2 +++ b/include/SDL_hints.h	Fri Jun 28 09:53:13 2013 -0700
     2.3 @@ -48,9 +48,9 @@
     2.4  #endif
     2.5  
     2.6  /**
     2.7 - *  \brief  A variable controlling how 3D acceleration is used to accelerate the SDL 1.2 screen surface.
     2.8 + *  \brief  A variable controlling how 3D acceleration is used to accelerate the SDL screen surface.
     2.9   *
    2.10 - *  SDL can try to accelerate the SDL 1.2 screen surface by using streaming
    2.11 + *  SDL can try to accelerate the SDL screen surface by using streaming
    2.12   *  textures with a 3D rendering engine.  This variable controls whether and
    2.13   *  how this is done.
    2.14   *
    2.15 @@ -107,7 +107,7 @@
    2.16  #define SDL_HINT_RENDER_SCALE_QUALITY       "SDL_RENDER_SCALE_QUALITY"
    2.17  
    2.18  /**
    2.19 - *  \brief  A variable controlling whether updates to the SDL 1.2 screen surface should be synchronized with the vertical refresh, to avoid tearing.
    2.20 + *  \brief  A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing.
    2.21   *
    2.22   *  This variable can be set to the following values:
    2.23   *    "0"       - Disable vsync
     3.1 --- a/include/doxyfile	Fri Jun 28 09:52:36 2013 -0700
     3.2 +++ b/include/doxyfile	Fri Jun 28 09:53:13 2013 -0700
     3.3 @@ -862,14 +862,14 @@
     3.4  # documentation sets from a single provider (such as a company or product suite) 
     3.5  # can be grouped.
     3.6  
     3.7 -DOCSET_FEEDNAME        = "SDL 1.2 Doxygen"
     3.8 +DOCSET_FEEDNAME        = "SDL 2.0 Doxygen"
     3.9  
    3.10  # When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
    3.11  # should uniquely identify the documentation set bundle. This should be a 
    3.12  # reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
    3.13  # will append .docset to the name.
    3.14  
    3.15 -DOCSET_BUNDLE_ID       = org.libsdl.sdl12
    3.16 +DOCSET_BUNDLE_ID       = org.libsdl.sdl20
    3.17  
    3.18  # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
    3.19  # will be generated that can be used as input for tools like the 
    3.20 @@ -883,7 +883,7 @@
    3.21  # can add a path in front of the file if the result should not be 
    3.22  # written to the html output directory.
    3.23  
    3.24 -CHM_FILE               = ./sdl12.chm
    3.25 +CHM_FILE               = ./sdl20.chm
    3.26  
    3.27  # If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
    3.28  # be used to specify the location (absolute path including file name) of 
     4.1 --- a/src/events/scancodes_windows.h	Fri Jun 28 09:52:36 2013 -0700
     4.2 +++ b/src/events/scancodes_windows.h	Fri Jun 28 09:53:13 2013 -0700
     4.3 @@ -21,6 +21,8 @@
     4.4  #include "../../include/SDL_scancode.h"
     4.5  
     4.6  /* Windows scancode to SDL scancode mapping table */
     4.7 +/* derived from Microsoft scan code document, http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/scancode.doc */
     4.8 +
     4.9  /* *INDENT-OFF* */
    4.10  static const SDL_Scancode windows_scancode_table[] = 
    4.11  {