encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-12-08 13:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged default into iOS-improvements

Browse Source
This commit is contained in:
Alex Szpakowski
2014-08-06 03:32:59 -03:00
parent 2eb7563e35 f5543f93b3
commit 292eedffe8
25 changed files with 873 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/SDL_hints.h
View File

@@ -261,8 +261,9 @@ extern "C" {
#define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS"
/**
* \brief A variable controlling whether an Android built-in accelerometer should be
* listed as a joystick device, rather than listing actual joysticks only.
* \brief A variable controlling whether the Android / iOS built-in
* accelerometer should be listed as a joystick device, rather than listing
* actual joysticks only.
*
* This variable can be set to the following values:
* "0" - List only real joysticks and accept input from them
@@ -345,7 +346,7 @@ extern "C" {
/**
* \brief If set to 1, then do not allow high-DPI windows. ("Retina" on Mac)
* \brief If set to 1, then do not allow high-DPI windows. ("Retina" on Mac and iOS)
*/
#define SDL_HINT_VIDEO_HIGHDPI_DISABLED "SDL_VIDEO_HIGHDPI_DISABLED"

8
include/SDL_syswm.h
View File

@@ -209,9 +209,9 @@ struct SDL_SysWMinfo
struct
{
#if defined(__OBJC__) && __has_feature(objc_arc)
NSWindow __unsafe_unretained *window; /* The Cocoa window */
NSWindow * __unsafe_unretained window; /* The Cocoa window */
#else
NSWindow *window; /* The Cocoa window */
NSWindow *window; /* The Cocoa window */
#endif
} cocoa;
#endif
@@ -219,9 +219,9 @@ struct SDL_SysWMinfo
struct
{
#if defined(__OBJC__) && __has_feature(objc_arc)
UIWindow __unsafe_unretained *window; /* The UIKit window */
UIWindow * __unsafe_unretained window; /* The UIKit window */
#else
UIWindow *window; /* The UIKit window */
UIWindow *window; /* The UIKit window */
#endif
} uikit;
#endif