yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Verzeichnisstruktur angepasst

Browse source
This commit is contained in:
Yamagi Burmeister 2009-03-04 15:50:05 +00:00
parent ef896a4ebd
commit e1b8aed4c8
5 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Makefile
View file

@ -104,6 +104,8 @@ client:
build/common \
build/gameabi \
build/posix \
build/posix/glob \
build/posix/sdl \
build/server
$(MAKE) build/client/quake2
@ -179,14 +181,14 @@ SERVER_OBJS = \
# POSIX platform objects
POSIX_OBJS = \
build/posix/cd_sdl.o \
build/posix/glob.o \
build/posix/net_udp.o \
build/posix/q_shlinux.o \
build/posix/snd_sdl.o \
build/posix/sys_linux.o \
build/posix/vid_menu.o \
build/posix/vid_so.o
build/posix/vid_so.o \
build/posix/glob/glob.o \
build/posix/sdl/cd.o \
build/posix/sdl/sound.o
# ----------
@ -353,21 +355,12 @@ build/server/sv_world.o : src/server/sv_world.c
# ----------
# POSIX build
build/posix/cd_sdl.o : src/platforms/posix/cd_sdl.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $< $(SDLCFLAGS)
build/posix/glob.o : src/platforms/posix/glob.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/posix/net_udp.o : src/platforms/posix/net_udp.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/posix/q_shlinux.o : src/platforms/posix/q_shlinux.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/posix/snd_sdl.o : src/platforms/posix/snd_sdl.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $< $(SDLCFLAGS)
build/posix/sys_linux.o : src/platforms/posix/sys_linux.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
@ -377,6 +370,15 @@ build/posix/vid_menu.o : src/platforms/posix/vid_menu.c
build/posix/vid_so.o : src/platforms/posix/vid_so.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/posix/glob/glob.o : src/platforms/posix/glob/glob.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
build/posix/sdl/cd.o : src/platforms/posix/sdl/cd.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $< $(SDLCFLAGS)
build/posix/sdl/sound.o : src/platforms/posix/sdl/sound.c
$(CC) $(CFLAGS_CLIENT) -o $@ -c $< $(SDLCFLAGS)
# ----------
# Dedicated server build

0
src/platforms/posix/glob.c → src/platforms/posix/glob/glob.c
View file

0
src/platforms/posix/glob.h → src/platforms/posix/glob/glob.h
View file

3
src/platforms/posix/cd_sdl.c → src/platforms/posix/sdl/cd.c
View file

@ -28,7 +28,7 @@
#include <stdio.h>
#include "SDL.h"
#include "../../client/header/client.h"
#include "../../../client/header/client.h"
static qboolean cdValid = false;
static qboolean initialized = false;
@ -105,7 +105,6 @@ void CDAudio_RandomPlay(void)
return;
//create array of available audio tracknumbers
for (; i < cd_id->numtracks; i++)
{
track_bools[i] = cd_id->track[i].type == SDL_AUDIO_TRACK;

5
src/platforms/posix/snd_sdl.c → src/platforms/posix/sdl/sound.c
View file

@ -27,8 +27,8 @@
#include "SDL.h"
#include "../../client/header/client.h"
#include "../../client/sound/snd_loc.h"
#include "../../../client/header/client.h"
#include "../../../client/sound/snd_loc.h"
static int snd_inited;
static dma_t *shm;
@ -182,3 +182,4 @@ SNDDMA_Submit (void)
void SNDDMA_BeginPainting(void)
{
}