From c5bf1e8c9398752be67caa4e93dc3d924b2fbf9a Mon Sep 17 00:00:00 2001
From: Yamagi Burmeister <yamagi@yamagi.org>
Date: Wed, 1 Aug 2012 13:47:32 +0200
Subject: [PATCH] Move src/sdl to src/backends/sdl

---
 Makefile                               | 8 ++++----
 src/{ => backends}/sdl/cd.c            | 2 +-
 src/{ => backends}/sdl/icon/q2icon.xbm | 0
 src/{ => backends}/sdl/input.c         | 8 ++++----
 src/{ => backends}/sdl/refresh.c       | 6 +++---
 src/{ => backends}/sdl/sound.c         | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename src/{ => backends}/sdl/cd.c (99%)
 rename src/{ => backends}/sdl/icon/q2icon.xbm (100%)
 rename src/{ => backends}/sdl/input.c (98%)
 rename src/{ => backends}/sdl/refresh.c (98%)
 rename src/{ => backends}/sdl/sound.c (98%)

diff --git a/Makefile b/Makefile
index 91d3b849..e991f2c4 100644
--- a/Makefile
+++ b/Makefile
@@ -452,6 +452,8 @@ GAME_OBJS_ = \
 
 # Used by the client
 CLIENT_OBJS_ := \
+	src/backends/sdl/cd.o \
+	src/backends/sdl/sound.o \
 	src/client/cl_cin.o \
 	src/client/cl_console.o \
 	src/client/cl_download.o \
@@ -498,8 +500,6 @@ CLIENT_OBJS_ := \
 	src/common/shared/shared.o \
 	src/common/unzip/ioapi.o \
 	src/common/unzip/unzip.o \
-	src/sdl/cd.o \
-	src/sdl/sound.o \
 	src/server/sv_cmd.o \
 	src/server/sv_conless.o \
 	src/server/sv_entities.o \
@@ -581,6 +581,8 @@ endif
 
 # Used by the OpenGL refresher
 OPENGL_OBJS_ = \
+	src/backends/sdl/input.o \
+	src/backends/sdl/refresh.o \
 	src/refresh/r_draw.o \
 	src/refresh/r_image.o \
 	src/refresh/r_light.o \
@@ -598,8 +600,6 @@ OPENGL_OBJS_ = \
 	src/refresh/files/tga.o \
 	src/refresh/files/jpeg.o \
 	src/refresh/files/wal.o \
-	src/sdl/input.o \
-	src/sdl/refresh.o \
     src/common/glob.o \
     src/common/shared/shared.o
 
diff --git a/src/sdl/cd.c b/src/backends/sdl/cd.c
similarity index 99%
rename from src/sdl/cd.c
rename to src/backends/sdl/cd.c
index 64dee575..b55c2361 100644
--- a/src/sdl/cd.c
+++ b/src/backends/sdl/cd.c
@@ -35,7 +35,7 @@
  #include "SDL.h"
 #endif
 
-#include "../client/header/client.h"
+#include "../../client/header/client.h"
 
 static qboolean cdValid = false;
 static qboolean initialized = false;
diff --git a/src/sdl/icon/q2icon.xbm b/src/backends/sdl/icon/q2icon.xbm
similarity index 100%
rename from src/sdl/icon/q2icon.xbm
rename to src/backends/sdl/icon/q2icon.xbm
diff --git a/src/sdl/input.c b/src/backends/sdl/input.c
similarity index 98%
rename from src/sdl/input.c
rename to src/backends/sdl/input.c
index 6959962f..63a4ec05 100644
--- a/src/sdl/input.c
+++ b/src/backends/sdl/input.c
@@ -25,15 +25,15 @@
  * =======================================================================
  */
  
-#include "../refresh/header/local.h"
-#include "../client/header/keyboard.h"
+#include "../../refresh/header/local.h"
+#include "../../client/header/keyboard.h"
  
 #ifdef _WIN32
 #include <SDL/SDL.h>
-#include "../windows/header/winquake.h"
+#include "../../windows/header/winquake.h"
 #else
 #include <SDL.h>
-#include "../unix/header/unix.h"
+#include "../../unix/header/unix.h"
 #endif
 
 #define MOUSE_MAX 3000
diff --git a/src/sdl/refresh.c b/src/backends/sdl/refresh.c
similarity index 98%
rename from src/sdl/refresh.c
rename to src/backends/sdl/refresh.c
index 47f64d07..0996cf29 100644
--- a/src/sdl/refresh.c
+++ b/src/backends/sdl/refresh.c
@@ -25,15 +25,15 @@
  * =======================================================================
  */
 
-#include "../refresh/header/local.h"
+#include "../../refresh/header/local.h"
 #include <GL/gl.h>
 
 #ifdef _WIN32
 #include <SDL/SDL.h>
-#include "../windows/header/glwindow.h"
+#include "../../windows/header/glwindow.h"
 #else
 #include <SDL.h>
-#include "../unix/header/glwindow.h"
+#include "../../unix/header/glwindow.h"
 #endif
 
 /* The window icon */
diff --git a/src/sdl/sound.c b/src/backends/sdl/sound.c
similarity index 98%
rename from src/sdl/sound.c
rename to src/backends/sdl/sound.c
index 11652a49..defebf4b 100644
--- a/src/sdl/sound.c
+++ b/src/backends/sdl/sound.c
@@ -36,8 +36,8 @@
 #include <SDL.h>
 #endif
 
-#include "../client/header/client.h"
-#include "../client/sound/header/local.h"
+#include "../../client/header/client.h"
+#include "../../client/sound/header/local.h"
 
 /* Global stuff */
 int    snd_inited = 0;