X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fsdl.h;h=e706ee9d129c5ec3d65c308b000509089c411026;hb=4c23826c2c9f8f6c7d1fec69769ba0d7254c9a7c;hp=69d2f20b299b589f90bb8b0d6ef770330e920e9a;hpb=52189f4b3b797e08699f67880198b585320cf8bf;p=rocksndiamonds.git

diff --git a/src/sdl.h b/src/sdl.h
index 69d2f20b..e706ee9d 100644
--- a/src/sdl.h
+++ b/src/sdl.h
@@ -16,7 +16,21 @@
 #define SDL_H
 
 #include "SDL.h"
+
+#if SDL_MAJOR_VERSION >= 1 && SDL_MINOR_VERSION >= 1
 #include "SDL_image.h"
+#include "SDL_mixer.h"
+#define USE_SDL_JOYSTICK
+#else
+#include "IMG.h"
+#include "mixer.h"
+#endif
+
+
+/* system dependent definitions */
+
+#define PLATFORM_STRING		"SDL"
+#define FULLSCREEN_STATUS	FULLSCREEN_AVAILABLE
 
 
 /* SDL type definitions */
@@ -90,8 +104,10 @@ typedef int			Colormap;
 #define KEY_Meta_R		SDLK_RMETA
 #define KEY_Alt_L		SDLK_LALT
 #define KEY_Alt_R		SDLK_RALT
+#define KEY_Super_L		SDLK_LSUPER
+#define KEY_Super_R		SDLK_RSUPER
 #define KEY_Mode_switch		SDLK_MODE
-#define KEY_Multi_key		KEY_UNDEFINED		/* undefined */
+#define KEY_Multi_key		SDLK_RCTRL
 
 #define KEY_BackSpace		SDLK_BACKSPACE
 #define KEY_Delete		SDLK_DELETE
@@ -101,6 +117,7 @@ typedef int			Colormap;
 #define KEY_End			SDLK_END
 #define KEY_Page_Up		SDLK_PAGEUP
 #define KEY_Page_Down		SDLK_PAGEDOWN
+#define KEY_Menu		SDLK_MENU
 
 #define KEY_space		SDLK_SPACE
 #define KEY_exclam		SDLK_EXCLAIM