yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-26 14:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Löse qgl/ und vid/ auf

Browse source
This commit is contained in:
Yamagi Burmeister 2010-10-19 09:17:18 +00:00
parent 5af05f7d81
commit 0e7a9957e9
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -193,6 +193,7 @@ CLIENT_OBJS = \
build/client/input/keyboard.o \ build/client/input/keyboard.o \
build/client/menu/menu.o \ build/client/menu/menu.o \
build/client/menu/qmenu.o \ build/client/menu/qmenu.o \
build/client/menu/videomenu.o \
build/client/sound/snd_dma.o \ build/client/sound/snd_dma.o \
build/client/sound/snd_mem.o \ build/client/sound/snd_mem.o \
build/client/sound/snd_mix.o \ build/client/sound/snd_mix.o \
@ -256,8 +257,7 @@ POSIX_OBJS = \
build/unix/hunk.o \ build/unix/hunk.o \
build/unix/misc.o \ build/unix/misc.o \
build/unix/system.o \ build/unix/system.o \
build/unix/vid/menu.o \ build/unix/vid.o
build/unix/vid/refresh.o
# ---------- # ----------
@ -345,8 +345,8 @@ OPENGL_POSIX_OBJS = \
build/ref_gl_unix/glob.o \ build/ref_gl_unix/glob.o \
build/ref_gl_unix/hunk.o \ build/ref_gl_unix/hunk.o \
build/ref_gl_unix/misc.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 build/client/menu/qmenu.o : src/client/menu/qmenu.c
$(CC) $(CFLAGS_CLIENT) -o $@ -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 build/client/sound/snd_dma.o : src/client/sound/snd_dma.c
$(CC) $(CFLAGS_CLIENT) -o $@ -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 build/unix/glob.o : src/unix/glob.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $< $(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/unix/vid/menu.o : src/unix/vid/menu.c build/unix/vid.o : src/unix/vid.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/unix/vid/refresh.o : src/unix/vid/refresh.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $< $(CC) $(CFLAGS_CLIENT) -o $@ -c $<
# ---------- # ----------
@ -810,7 +810,7 @@ build/ref_gl_unix/hunk.o: src/unix/hunk.c
build/ref_gl_unix/misc.o: src/unix/misc.c build/ref_gl_unix/misc.o: src/unix/misc.c
$(CC) $(CFLAGS_OPENGL) -o $@ -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 $< $(CC) $(CFLAGS_OPENGL) -o $@ -c $<
build/ref_gl_unix/refresh.o: src/sdl/refresh.c build/ref_gl_unix/refresh.o: src/sdl/refresh.c

0
src/unix/vid/menu.c → src/client/menu/videomenu.c
View file

0
src/unix/qgl/icon/q2icon.xbm → src/sdl/icon/q2icon.xbm
View file

4
src/sdl/refresh.c
View file

@ -27,7 +27,7 @@
#include "SDL.h" #include "SDL.h"
#include <GL/gl.h> #include <GL/gl.h>
#include "../refresh/header/local.h" #include "../refresh/header/local.h"
#include "../unix/qgl/header/glwindow.h" #include "../unix/header/glwindow.h"
#include "../client/input/header/keyboard.h" #include "../client/input/header/keyboard.h"
#include "../unix/header/unix.h" #include "../unix/header/unix.h"
@ -87,7 +87,7 @@ int GLimp_Init( void *hInstance, void *wndProc )
static void SetSDLIcon() static void SetSDLIcon()
{ {
#include "../unix/qgl/icon/q2icon.xbm" #include "icon/q2icon.xbm"
SDL_Surface *icon; SDL_Surface *icon;
SDL_Color color; SDL_Color color;
Uint8 *ptr; Uint8 *ptr;

0
src/unix/qgl/header/glwindow.h → src/unix/header/glwindow.h
View file

2
src/unix/qgl/qgl.c → src/unix/qgl.c
View file

@ -31,7 +31,7 @@
#include <dlfcn.h> #include <dlfcn.h>
#include "../../refresh/header/local.h" #include "../refresh/header/local.h"
#include "header/glwindow.h" #include "header/glwindow.h"
void ( APIENTRY *qglAccum )( GLenum op, GLfloat value ); void ( APIENTRY *qglAccum )( GLenum op, GLfloat value );

4
src/unix/vid/refresh.c → src/unix/vid.c
View file

@ -38,8 +38,8 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include "../../client/header/client.h" #include "../client/header/client.h"
#include "../header/unix.h" #include "header/unix.h"
/* Structure containing functions exported from refresh DLL */ /* Structure containing functions exported from refresh DLL */
refexport_t re; refexport_t re;