rnd-20140103-1-src

diff --git a/Makefile b/Makefile
index e24743a52444abb6240e57463f5219b3f79966b9..00e7695b304c300c432e5e4d28fdd875c44125fc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -90,6 +90,9 @@ mac:
 mac-static:
        @$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
 
+mac2-static:
+       @$(MAKE_CMD) PLATFORM=macosx TARGET=sdl2-static
+
 msdos:
        @$(MAKE_CMD) PLATFORM=msdos
 

diff --git a/src/Makefile b/src/Makefile
index 018be6a502fd61653da5628014e69533bf27633b..ebe3091f7b26ea5d538b82541250ad450f472d9c 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -120,6 +120,12 @@ SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg -lmikmod
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
 endif
 
+ifeq ($(TARGET),sdl2-static)           # compiling for SDL2 target (static)
+SYS_CFLAGS = -DTARGET_SDL2 $(shell sdl2-config --cflags)
+SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net -lsmpeg2 -lmikmod
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl2-config --static-libs)
+endif
+
 ifeq ($(TARGET),allegro)               # compiling for Allegro target
 SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include
 SYS_LDFLAGS = -lalleg

diff --git a/src/conftime.h b/src/conftime.h
index bb5776296bcf5560cdc0ced032479b07d7c80af9..2e16c2fce5bd5478490a12ebbab5f3d8d900cb59 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2013-12-28 23:17"
+#define COMPILE_DATE_STRING "2014-01-01 20:20"

diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c
index a72bdcc0cc80e5c52df9c2267c70f36802e714a5..74148a4bb7381f58b5488ccaca95e301ba236c29 100644 (file)
--- a/src/libgame/sdl.c
+++ b/src/libgame/sdl.c
@@ -444,8 +444,6 @@ boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
                                             0xFF000000);
 #endif
 
-         printf("::: pitch == %d\n", new_surface->pitch);
-
          if (new_surface == NULL)
            Error(ERR_WARN, "SDL_CreateRGBSurface() failed: %s",
                  SDL_GetError());

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index b228c00934820a81e4d300270aae8cb0ca764574..6f130bb1bea70b6492cd1f91ef3596e4deed101b 100644 (file)
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -186,8 +186,10 @@ struct MouseCursorInfo
 #define KSYM_Page_Up           SDLK_PAGEUP
 #define KSYM_Page_Down         SDLK_PAGEDOWN
 
+#if defined(TARGET_SDL2)
 #define KSYM_Menu              SDLK_MENU
 #define KSYM_Back              SDLK_AC_BACK
+#endif
 
 #define KSYM_space             SDLK_SPACE
 #define KSYM_exclam            SDLK_EXCLAIM