From 3fb849239832cd36431475fed447dae0b9d7a819 Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Wed, 1 Aug 2012 13:58:10 +0200 Subject: [PATCH] Move src/unix to src/backends/unix --- Makefile | 28 +++++++++++------------ src/backends/sdl/input.c | 4 ++-- src/backends/sdl/refresh.c | 4 ++-- src/{ => backends}/unix/header/glwindow.h | 0 src/{ => backends}/unix/header/qal.h | 0 src/{ => backends}/unix/header/unix.h | 0 src/{ => backends}/unix/hunk.c | 2 +- src/{ => backends}/unix/main.c | 2 +- src/{ => backends}/unix/network.c | 2 +- src/{ => backends}/unix/qal.c | 2 +- src/{ => backends}/unix/qgl.c | 2 +- src/{ => backends}/unix/signalhandler.c | 2 +- src/{ => backends}/unix/system.c | 4 ++-- src/{ => backends}/unix/vid.c | 2 +- src/client/sound/snd_al.c | 2 +- src/client/sound/snd_dma.c | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) rename src/{ => backends}/unix/header/glwindow.h (100%) rename src/{ => backends}/unix/header/qal.h (100%) rename src/{ => backends}/unix/header/unix.h (100%) rename src/{ => backends}/unix/hunk.c (98%) rename src/{ => backends}/unix/main.c (98%) rename src/{ => backends}/unix/network.c (99%) rename src/{ => backends}/unix/qal.c (99%) rename src/{ => backends}/unix/qgl.c (99%) rename src/{ => backends}/unix/signalhandler.c (98%) rename src/{ => backends}/unix/system.c (98%) rename src/{ => backends}/unix/vid.c (99%) diff --git a/Makefile b/Makefile index e991f2c4..20eb6a28 100644 --- a/Makefile +++ b/Makefile @@ -520,13 +520,13 @@ CLIENT_OBJS_ += \ src/windows/vid.o else CLIENT_OBJS_ += \ - src/unix/hunk.o \ - src/unix/main.o \ - src/unix/network.o \ - src/unix/qal.o \ - src/unix/signalhandler.o \ - src/unix/system.o \ - src/unix/vid.o + src/backends/unix/hunk.o \ + src/backends/unix/main.o \ + src/backends/unix/network.o \ + src/backends/unix/qal.o \ + src/backends/unix/signalhandler.o \ + src/backends/unix/system.o \ + src/backends/unix/vid.o endif # ---------- @@ -570,11 +570,11 @@ SERVER_OBJS_ += \ src/windows/system.o else SERVER_OBJS_ += \ - src/unix/hunk.o \ - src/unix/main.o \ - src/unix/network.o \ - src/unix/signalhandler.o \ - src/unix/system.o + src/backends/unix/hunk.o \ + src/backends/unix/main.o \ + src/backends/unix/network.o \ + src/backends/unix/signalhandler.o \ + src/backends/unix/system.o endif # ---------- @@ -609,8 +609,8 @@ OPENGL_OBJS_ += \ src/windows/qgl.o else OPENGL_OBJS_ += \ - src/unix/hunk.o \ - src/unix/qgl.o + src/backends/unix/hunk.o \ + src/backends/unix/qgl.o endif # ---------- diff --git a/src/backends/sdl/input.c b/src/backends/sdl/input.c index 63a4ec05..ab2cea1b 100644 --- a/src/backends/sdl/input.c +++ b/src/backends/sdl/input.c @@ -30,10 +30,10 @@ #ifdef _WIN32 #include -#include "../../windows/header/winquake.h" +#include "../windows/header/winquake.h" #else #include -#include "../../unix/header/unix.h" +#include "../unix/header/unix.h" #endif #define MOUSE_MAX 3000 diff --git a/src/backends/sdl/refresh.c b/src/backends/sdl/refresh.c index 0996cf29..ca85f19e 100644 --- a/src/backends/sdl/refresh.c +++ b/src/backends/sdl/refresh.c @@ -30,10 +30,10 @@ #ifdef _WIN32 #include -#include "../../windows/header/glwindow.h" +#include "../windows/header/glwindow.h" #else #include -#include "../../unix/header/glwindow.h" +#include "../unix/header/glwindow.h" #endif /* The window icon */ diff --git a/src/unix/header/glwindow.h b/src/backends/unix/header/glwindow.h similarity index 100% rename from src/unix/header/glwindow.h rename to src/backends/unix/header/glwindow.h diff --git a/src/unix/header/qal.h b/src/backends/unix/header/qal.h similarity index 100% rename from src/unix/header/qal.h rename to src/backends/unix/header/qal.h diff --git a/src/unix/header/unix.h b/src/backends/unix/header/unix.h similarity index 100% rename from src/unix/header/unix.h rename to src/backends/unix/header/unix.h diff --git a/src/unix/hunk.c b/src/backends/unix/hunk.c similarity index 98% rename from src/unix/hunk.c rename to src/backends/unix/hunk.c index 5b7269a3..8a619e7f 100644 --- a/src/unix/hunk.c +++ b/src/backends/unix/hunk.c @@ -33,7 +33,7 @@ #include #include -#include "../common/header/common.h" +#include "../../common/header/common.h" #if defined(__FreeBSD__) #include diff --git a/src/unix/main.c b/src/backends/unix/main.c similarity index 98% rename from src/unix/main.c rename to src/backends/unix/main.c index 4c90042b..4d9871fa 100644 --- a/src/unix/main.c +++ b/src/backends/unix/main.c @@ -31,7 +31,7 @@ #include #include -#include "../common/header/common.h" +#include "../../common/header/common.h" #include "header/unix.h" int diff --git a/src/unix/network.c b/src/backends/unix/network.c similarity index 99% rename from src/unix/network.c rename to src/backends/unix/network.c index a248f490..ebe362ed 100644 --- a/src/unix/network.c +++ b/src/backends/unix/network.c @@ -24,7 +24,7 @@ * ======================================================================= */ -#include "../common/header/common.h" +#include "../../common/header/common.h" #include #include diff --git a/src/unix/qal.c b/src/backends/unix/qal.c similarity index 99% rename from src/unix/qal.c rename to src/backends/unix/qal.c index 0bc45002..74deec1f 100644 --- a/src/unix/qal.c +++ b/src/backends/unix/qal.c @@ -36,7 +36,7 @@ #include #include -#include "../common/header/common.h" +#include "../../common/header/common.h" #include "header/qal.h" static ALCcontext *context; diff --git a/src/unix/qgl.c b/src/backends/unix/qgl.c similarity index 99% rename from src/unix/qgl.c rename to src/backends/unix/qgl.c index f3561e5f..84f8f29b 100644 --- a/src/unix/qgl.c +++ b/src/backends/unix/qgl.c @@ -31,7 +31,7 @@ #include -#include "../refresh/header/local.h" +#include "../../refresh/header/local.h" #include "header/glwindow.h" void (APIENTRY *qglAccum)(GLenum op, GLfloat value); diff --git a/src/unix/signalhandler.c b/src/backends/unix/signalhandler.c similarity index 98% rename from src/unix/signalhandler.c rename to src/backends/unix/signalhandler.c index a0b55d42..ce3d0825 100644 --- a/src/unix/signalhandler.c +++ b/src/backends/unix/signalhandler.c @@ -31,7 +31,7 @@ #include #endif -#include "../common/header/common.h" +#include "../../common/header/common.h" #ifdef __linux__ diff --git a/src/unix/system.c b/src/backends/unix/system.c similarity index 98% rename from src/unix/system.c rename to src/backends/unix/system.c index 88a1f1f8..3bd337a4 100644 --- a/src/unix/system.c +++ b/src/backends/unix/system.c @@ -45,8 +45,8 @@ #include #include -#include "../common/header/common.h" -#include "../common/header/glob.h" +#include "../../common/header/common.h" +#include "../../common/header/glob.h" #include "header/unix.h" unsigned sys_frame_time; diff --git a/src/unix/vid.c b/src/backends/unix/vid.c similarity index 99% rename from src/unix/vid.c rename to src/backends/unix/vid.c index 8a58efa3..e5e3fe32 100644 --- a/src/unix/vid.c +++ b/src/backends/unix/vid.c @@ -38,7 +38,7 @@ #include #include -#include "../client/header/client.h" +#include "../../client/header/client.h" #include "header/unix.h" /* Structure containing functions exported from refresh DLL */ diff --git a/src/client/sound/snd_al.c b/src/client/sound/snd_al.c index 026f502f..4ddb73d5 100644 --- a/src/client/sound/snd_al.c +++ b/src/client/sound/snd_al.c @@ -37,7 +37,7 @@ #ifdef _WIN32 #include "../../windows/header/qal.h" #else - #include "../../unix/header/qal.h" + #include "../../backends/unix/header/qal.h" #endif /* translates from AL coordinate system to quake */ diff --git a/src/client/sound/snd_dma.c b/src/client/sound/snd_dma.c index 9081b743..c7306fae 100644 --- a/src/client/sound/snd_dma.c +++ b/src/client/sound/snd_dma.c @@ -33,7 +33,7 @@ #ifdef _WIN32 #include "../../windows/header/qal.h" #else - #include "../../unix/header/qal.h" + #include "../../backends/unix/header/qal.h" #endif void S_Play(void);