Merged
authorSam Lantinga <slouken@libsdl.org>
Fri, 28 Jun 2013 09:53:13 -0700
changeset 7331 33c15a2ec5e7
parent 7330 95a9e82b5414 (current diff)
parent 7329 e8c4d743dd83 (diff)
child 7333 b74f920d964e
Merged
--- a/Xcode/SDL/pkg-support/SDL.info	Fri Jun 28 09:52:36 2013 -0700
+++ b/Xcode/SDL/pkg-support/SDL.info	Fri Jun 28 09:53:13 2013 -0700
@@ -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
--- a/include/SDL_hints.h	Fri Jun 28 09:52:36 2013 -0700
+++ b/include/SDL_hints.h	Fri Jun 28 09:53:13 2013 -0700
@@ -48,9 +48,9 @@
 #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 @@
 #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
--- a/include/doxyfile	Fri Jun 28 09:52:36 2013 -0700
+++ b/include/doxyfile	Fri Jun 28 09:53:13 2013 -0700
@@ -862,14 +862,14 @@
 # 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 @@
 # 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 
--- a/src/events/scancodes_windows.h	Fri Jun 28 09:52:36 2013 -0700
+++ b/src/events/scancodes_windows.h	Fri Jun 28 09:53:13 2013 -0700
@@ -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[] = 
 {