projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20140104-4-src
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.h
diff --git
a/src/libgame/sdl.h
b/src/libgame/sdl.h
index 254b9927166fc33d126911e9898c49b803610369..5652613ac59915a6d32e848bb17a3800e8db9307 100644
(file)
--- a/
src/libgame/sdl.h
+++ b/
src/libgame/sdl.h
@@
-47,7
+47,17
@@
#define TARGET_STRING "SDL"
#endif
#define TARGET_STRING "SDL"
#endif
+#if defined(PLATFORM_ANDROID)
+#define WINDOW_SCALING_STATUS WINDOW_SCALING_NOT_AVAILABLE
+#define FULLSCREEN_STATUS FULLSCREEN_NOT_AVAILABLE
+#elif defined(TARGET_SDL2)
+#define WINDOW_SCALING_STATUS WINDOW_SCALING_AVAILABLE
#define FULLSCREEN_STATUS FULLSCREEN_AVAILABLE
#define FULLSCREEN_STATUS FULLSCREEN_AVAILABLE
+#define USE_DESKTOP_FULLSCREEN TRUE
+#else // SDL 1.2
+#define WINDOW_SCALING_STATUS WINDOW_SCALING_NOT_AVAILABLE
+#define FULLSCREEN_STATUS FULLSCREEN_AVAILABLE
+#endif
#define CURSOR_MAX_WIDTH 32
#define CURSOR_MAX_HEIGHT 32
#define CURSOR_MAX_WIDTH 32
#define CURSOR_MAX_HEIGHT 32
@@
-201,7
+211,13
@@
struct MouseCursorInfo
#define KSYM_quotedbl SDLK_QUOTEDBL
#define KSYM_numbersign SDLK_HASH
#define KSYM_dollar SDLK_DOLLAR
#define KSYM_quotedbl SDLK_QUOTEDBL
#define KSYM_numbersign SDLK_HASH
#define KSYM_dollar SDLK_DOLLAR
-#define KSYM_percent KSYM_UNDEFINED /* undefined */
+
+#if defined(TARGET_SDL2)
+#define KSYM_percent SDLK_PERCENT
+#else
+#define KSYM_percent 37 /* undefined in SDL */
+#endif
+
#define KSYM_ampersand SDLK_AMPERSAND
#define KSYM_apostrophe SDLK_QUOTE
#define KSYM_parenleft SDLK_LEFTPAREN
#define KSYM_ampersand SDLK_AMPERSAND
#define KSYM_apostrophe SDLK_QUOTE
#define KSYM_parenleft SDLK_LEFTPAREN
@@
-411,6
+427,9
@@
struct MouseCursorInfo
#define KMOD_Meta (KMOD_Meta_L | KMOD_Meta_R)
#define KMOD_Alt (KMOD_Alt_L | KMOD_Alt_R)
#define KMOD_Meta (KMOD_Meta_L | KMOD_Meta_R)
#define KMOD_Alt (KMOD_Alt_L | KMOD_Alt_R)
+#if defined(TARGET_SDL2)
+#define KMOD_TextInput (KMOD_Shift | KMOD_Alt_R)
+#endif
/* SDL function definitions */
/* SDL function definitions */