From 0e7a9957e9c04f740df04d08c2cfdcc0015014b0 Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Tue, 19 Oct 2010 09:17:18 +0000 Subject: [PATCH] =?UTF-8?q?L=C3=B6se=20qgl/=20und=20vid/=20auf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 20 +++++++++---------- .../vid/menu.c => client/menu/videomenu.c} | 0 src/{unix/qgl => sdl}/icon/q2icon.xbm | 0 src/sdl/refresh.c | 4 ++-- src/unix/{qgl => }/header/glwindow.h | 0 src/unix/{qgl => }/qgl.c | 2 +- src/unix/{vid/refresh.c => vid.c} | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) rename src/{unix/vid/menu.c => client/menu/videomenu.c} (100%) rename src/{unix/qgl => sdl}/icon/q2icon.xbm (100%) rename src/unix/{qgl => }/header/glwindow.h (100%) rename src/unix/{qgl => }/qgl.c (99%) rename src/unix/{vid/refresh.c => vid.c} (99%) diff --git a/Makefile b/Makefile index 82e5e50f..ccb966ba 100644 --- a/Makefile +++ b/Makefile @@ -193,6 +193,7 @@ CLIENT_OBJS = \ build/client/input/keyboard.o \ build/client/menu/menu.o \ build/client/menu/qmenu.o \ + build/client/menu/videomenu.o \ build/client/sound/snd_dma.o \ build/client/sound/snd_mem.o \ build/client/sound/snd_mix.o \ @@ -256,8 +257,7 @@ POSIX_OBJS = \ build/unix/hunk.o \ build/unix/misc.o \ build/unix/system.o \ - build/unix/vid/menu.o \ - build/unix/vid/refresh.o + build/unix/vid.o # ---------- @@ -345,8 +345,8 @@ OPENGL_POSIX_OBJS = \ build/ref_gl_unix/glob.o \ build/ref_gl_unix/hunk.o \ build/ref_gl_unix/misc.o \ - build/ref_gl_unix/qgl.o \ - build/ref_gl_unix/refresh.o + build/ref_gl_unix/refresh.o \ + build/ref_gl_unix/qgl.o # ---------- @@ -492,6 +492,9 @@ build/client/menu/menu.o : src/client/menu/menu.c build/client/menu/qmenu.o : src/client/menu/qmenu.c $(CC) $(CFLAGS_CLIENT) -o $@ -c $< +build/client/menu/videomenu.o : src/client/menu/videomenu.c + $(CC) $(CFLAGS_CLIENT) -o $@ -c $< + build/client/sound/snd_dma.o : src/client/sound/snd_dma.c $(CC) $(CFLAGS_CLIENT) -o $@ -c $< @@ -633,10 +636,7 @@ build/unix/system.o : src/unix/system.c build/unix/glob.o : src/unix/glob.c $(CC) $(CFLAGS_CLIENT) -o $@ -c $< -build/unix/vid/menu.o : src/unix/vid/menu.c - $(CC) $(CFLAGS_CLIENT) -o $@ -c $< - -build/unix/vid/refresh.o : src/unix/vid/refresh.c +build/unix/vid.o : src/unix/vid.c $(CC) $(CFLAGS_CLIENT) -o $@ -c $< # ---------- @@ -810,9 +810,9 @@ build/ref_gl_unix/hunk.o: src/unix/hunk.c build/ref_gl_unix/misc.o: src/unix/misc.c $(CC) $(CFLAGS_OPENGL) -o $@ -c $< -build/ref_gl_unix/qgl.o: src/unix/qgl/qgl.c +build/ref_gl_unix/qgl.o: src/unix/qgl.c $(CC) $(CFLAGS_OPENGL) -o $@ -c $< - + build/ref_gl_unix/refresh.o: src/sdl/refresh.c $(CC) $(CFLAGS_OPENGL) $(SDLCFLAGS) -o $@ -c $< diff --git a/src/unix/vid/menu.c b/src/client/menu/videomenu.c similarity index 100% rename from src/unix/vid/menu.c rename to src/client/menu/videomenu.c diff --git a/src/unix/qgl/icon/q2icon.xbm b/src/sdl/icon/q2icon.xbm similarity index 100% rename from src/unix/qgl/icon/q2icon.xbm rename to src/sdl/icon/q2icon.xbm diff --git a/src/sdl/refresh.c b/src/sdl/refresh.c index 0f957ea4..e02e151d 100644 --- a/src/sdl/refresh.c +++ b/src/sdl/refresh.c @@ -27,7 +27,7 @@ #include "SDL.h" #include #include "../refresh/header/local.h" -#include "../unix/qgl/header/glwindow.h" +#include "../unix/header/glwindow.h" #include "../client/input/header/keyboard.h" #include "../unix/header/unix.h" @@ -87,7 +87,7 @@ int GLimp_Init( void *hInstance, void *wndProc ) static void SetSDLIcon() { -#include "../unix/qgl/icon/q2icon.xbm" +#include "icon/q2icon.xbm" SDL_Surface *icon; SDL_Color color; Uint8 *ptr; diff --git a/src/unix/qgl/header/glwindow.h b/src/unix/header/glwindow.h similarity index 100% rename from src/unix/qgl/header/glwindow.h rename to src/unix/header/glwindow.h diff --git a/src/unix/qgl/qgl.c b/src/unix/qgl.c similarity index 99% rename from src/unix/qgl/qgl.c rename to src/unix/qgl.c index 90eefe34..4599de98 100644 --- a/src/unix/qgl/qgl.c +++ b/src/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/vid/refresh.c b/src/unix/vid.c similarity index 99% rename from src/unix/vid/refresh.c rename to src/unix/vid.c index 899372de..ace8c25c 100644 --- a/src/unix/vid/refresh.c +++ b/src/unix/vid.c @@ -38,8 +38,8 @@ #include #include -#include "../../client/header/client.h" -#include "../header/unix.h" +#include "../client/header/client.h" +#include "header/unix.h" /* Structure containing functions exported from refresh DLL */ refexport_t re;