Add SDL2 compile option.

This sets SDL2 as the default as well.

Author: oitzujoey

Makefile

@@ -240,6 +240,10 @@ ifndef DEBUG_CFLAGS
 DEBUG_CFLAGS=-g -O0
 endif
 
+ifndef SDL_VERSION
+SDL_VERSION=2
+endif
+
 #############################################################################
 
 BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
@@ -274,7 +278,11 @@ Q3LCCETCDIR=$(MOUNT_DIR)/tools/lcc/etc
 Q3LCCSRCDIR=$(MOUNT_DIR)/tools/lcc/src
 LOKISETUPDIR=misc/setup
 NSISDIR=misc/nsis
-SDLHDIR=$(MOUNT_DIR)/SDL12
+ifeq ($(SDL_VERSION),2)
+  SDLHDIR=$(MOUNT_DIR)/SDL2
+else
+  SDLHDIR=$(MOUNT_DIR)/SDL12
+endif
 LIBSDIR=$(MOUNT_DIR)/libs
 
 bin_path=$(shell which $(1) 2> /dev/null)
@@ -288,15 +296,27 @@ ifneq ($(BUILD_CLIENT),0)
     CURL_LIBS=$(shell pkg-config --silence-errors --libs libcurl)
     OPENAL_CFLAGS=$(shell pkg-config --silence-errors --cflags openal)
     OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
-    SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
-    SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl)
+    ifeq ($(SDL_VERSION),2)
+      SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl2|sed 's/-Dmain=SDL_main//')
+      SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl2)
+    else
+      SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
+      SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl)
+    endif
     FREETYPE_CFLAGS=$(shell pkg-config --silence-errors --cflags freetype2)
   endif
   # Use sdl-config if all else fails
   ifeq ($(SDL_CFLAGS),)
-    ifneq ($(call bin_path, sdl-config),)
-      SDL_CFLAGS=$(shell sdl-config --cflags)
-      SDL_LIBS=$(shell sdl-config --libs)
+    ifeq ($(SDL_VERSION),2)
+      ifneq ($(call bin_path, sdl2-config),)
+        SDL_CFLAGS=$(shell sdl2-config --cflags)
+        SDL_LIBS=$(shell sdl2-config --libs)
+      endif
+    else
+      ifneq ($(call bin_path, sdl-config),)
+        SDL_CFLAGS=$(shell sdl-config --cflags)
+        SDL_LIBS=$(shell sdl-config --libs)
+      endif
     endif
   endif
 endif
@@ -495,11 +515,17 @@ ifeq ($(PLATFORM),darwin)
 
   # We copy sdlmain before ranlib'ing it so that subversion doesn't think
   #  the file has been modified by each build.
-  LIBSDLMAIN=$(B)/libSDLmain.a
-  LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDLmain.a
-  CLIENT_LIBS += -framework IOKit \
-    $(LIBSDIR)/macosx/libSDL-1.2.0.dylib
-  RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL-1.2.0.dylib
+  ifeq ($(SDL_VERSION),2)
+    LIBSDLMAIN=$(B)/libSDL2main.a
+    LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDL2main.a
+    CLIENT_LIBS += -framework IOKit $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib
+    RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib
+  else
+    LIBSDLMAIN=$(B)/libSDLmain.a
+    LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDLmain.a
+    CLIENT_LIBS += -framework IOKit $(LIBSDIR)/macosx/libSDL-1.2.0.dylib
+    RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL-1.2.0.dylib
+  endif
 
   OPTIMIZEVM += -falign-loops=16
   OPTIMIZE = $(OPTIMIZEVM) -ffast-math
@@ -643,24 +669,44 @@ ifeq ($(PLATFORM),mingw32)
 
   ifeq ($(USE_LOCAL_HEADERS),1)
     CLIENT_CFLAGS += -I$(SDLHDIR)/include
-    ifeq ($(ARCH),x86)
-    CLIENT_LIBS += $(LIBSDIR)/win32/libSDLmain.a \
-                      $(LIBSDIR)/win32/libSDL.dll.a
-    RENDERER_LIBS += $(LIBSDIR)/win32/libSDLmain.a \
-                      $(LIBSDIR)/win32/libSDL.dll.a
-    SDLDLL=SDL.dll
+    ifeq ($(SDL_VERSION),2)
+      ifeq ($(ARCH),x86)
+        CLIENT_LIBS += $(LIBSDIR)/win32/libSDL2main.a \
+                          $(LIBSDIR)/win32/libSDL2.dll.a
+        RENDERER_LIBS += $(LIBSDIR)/win32/libSDL2main.a \
+                          $(LIBSDIR)/win32/libSDL2.dll.a
+        SDLDLL=SDL2.dll
+      else
+        CLIENT_LIBS += $(LIBSDIR)/win64/libSDL264main.a \
+                          $(LIBSDIR)/win64/libSDL264.dll.a
+        RENDERER_LIBS += $(LIBSDIR)/win64/libSDL264main.a \
+                          $(LIBSDIR)/win64/libSDL264.dll.a
+        SDLDLL=SDL264.dll
+      endif
     else
-    CLIENT_LIBS += $(LIBSDIR)/win64/libSDLmain.a \
-                      $(LIBSDIR)/win64/libSDL64.dll.a
-    RENDERER_LIBS += $(LIBSDIR)/win64/libSDLmain.a \
-                      $(LIBSDIR)/win64/libSDL64.dll.a
-    SDLDLL=SDL64.dll
+      ifeq ($(ARCH),x86)
+        CLIENT_LIBS += $(LIBSDIR)/win32/libSDLmain.a \
+                          $(LIBSDIR)/win32/libSDL.dll.a
+        RENDERER_LIBS += $(LIBSDIR)/win32/libSDLmain.a \
+                          $(LIBSDIR)/win32/libSDL.dll.a
+        SDLDLL=SDL.dll
+      else
+        CLIENT_LIBS += $(LIBSDIR)/win64/libSDLmain.a \
+                          $(LIBSDIR)/win64/libSDL64.dll.a
+        RENDERER_LIBS += $(LIBSDIR)/win64/libSDLmain.a \
+                          $(LIBSDIR)/win64/libSDL64.dll.a
+        SDLDLL=SDL64.dll
+      endif
     endif
   else
     CLIENT_CFLAGS += $(SDL_CFLAGS)
     CLIENT_LIBS += $(SDL_LIBS)
     RENDERER_LIBS += $(SDL_LIBS)
-    SDLDLL=SDL.dll
+    ifeq ($(SDL_VERSION),2)
+      SDLDLL=SDL2.dll
+    else
+      SDLDLL=SDL.dll
+    endif
   endif
 
 else # ifeq mingw32

Makefile.OpenArena

@@ -33,6 +33,9 @@ BUILD_RENDERER_OPENGL2=0
 # You can disable the renderer libraries and build in the OA renderer by default
 USE_RENDERER_DLOPEN=0
 
+# Choose version 1 or 2
+SDL_VERSION=2
+
 ifndef USE_CONSOLE_WINDOW
 USE_CONSOLE_WINDOW=1			# use an early console window (WIN32 only)
 endif

code/client/cl_keys.c

@@ -21,6 +21,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "client.h"
 
+#ifdef USE_LOCAL_HEADERS
+#	include "SDL.h"
+#else
+#	include <SDL.h>
+#endif
+
 /*
 
 key up events are sent even if in console mode
@@ -401,7 +407,11 @@ void Field_Paste( field_t *edit ) {
 	char	*cbd;
 	int		pasteLen, i;
 
+#if SDL_MAJOR_VERSION == 2
+	cbd = SDL_GetClipboardText();
+#else
 	cbd = Sys_GetClipboardData();
+#endif
 
 	if ( !cbd ) {
 		return;
@@ -413,7 +423,11 @@ void Field_Paste( field_t *edit ) {
 		Field_CharEvent( edit, cbd[i] );
 	}
 
+#if SDL_MAJOR_VERSION == 2
+	SDL_free( cbd );
+#else
 	Z_Free( cbd );
+#endif
 }
 
 /*

code/client/cl_ui.c

@@ -584,7 +584,11 @@ CL_GetClipboardData
 static void CL_GetClipboardData( char *buf, int buflen ) {
 	char	*cbd;
 
+#if SDL_MAJOR_VERSION == 2
+	cbd = Sys_GetClipboardData2();
+#else
 	cbd = Sys_GetClipboardData();
+#endif
 
 	if ( !cbd ) {
 		*buf = 0;

code/renderercommon/tr_public.h

@@ -169,7 +169,11 @@ typedef struct {
 	void	(*CL_WriteAVIVideoFrame)( const byte *buffer, int size );
 
 	// input event handling
+#if SDL_MAJOR_VERSION == 2
+	void	(*IN_Init)( void *windowData );
+#else
 	void	(*IN_Init)( void );
+#endif
 	void	(*IN_Shutdown)( void );
 	void	(*IN_Restart)( void );
 

code/sdl/sdl_gamma.c

@@ -29,6 +29,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../renderercommon/tr_common.h"
 #include "../qcommon/qcommon.h"
 
+#if SDL_MAJOR_VERSION == 2
+extern SDL_Window *SDL_window;
+#endif
+
 #ifdef _WIN32
 // leilei - 3dfx gamma fix
 BOOL  ( WINAPI * qwglGetDeviceGammaRamp3DFX)( HDC, LPVOID );
@@ -103,7 +107,11 @@ void GLimp_SetGamma( unsigned char red[256], unsigned char green[256], unsigned
 	else
 #endif
 	{
-	SDL_SetGammaRamp(table[0], table[1], table[2]);
+#if SDL_MAJOR_VERSION == 2
+		SDL_SetWindowGammaRamp(SDL_window, table[0], table[1], table[2]);
+#else
+		SDL_SetGammaRamp(table[0], table[1], table[2]);
+#endif
 	}
 }