yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-29 15:51:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some minor restructuring and cleanup.

Browse source
This commit is contained in:
svdijk 2012-11-06 20:47:13 +01:00 committed by Yamagi Burmeister
parent 1c0934f462
commit 823753dec9
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Makefile
View file

@ -587,16 +587,16 @@ CLIENT_OBJS_ := \
ifeq ($(OSTYPE), Windows) ifeq ($(OSTYPE), Windows)
CLIENT_OBJS_ += \ CLIENT_OBJS_ += \
src/backends/windows/mem.o \
src/backends/windows/network.o \ src/backends/windows/network.o \
src/backends/windows/system.o src/backends/windows/system.o \
src/backends/windows/shared/mem.o
else else
CLIENT_OBJS_ += \ CLIENT_OBJS_ += \
src/backends/unix/hunk.o \
src/backends/unix/main.o \ src/backends/unix/main.o \
src/backends/unix/network.o \ src/backends/unix/network.o \
src/backends/unix/signalhandler.o \ src/backends/unix/signalhandler.o \
src/backends/unix/system.o src/backends/unix/system.o \
src/backends/unix/shared/hunk.o
endif endif
ifeq ($(OSTYPE), Darwin) ifeq ($(OSTYPE), Darwin)
@ -639,16 +639,16 @@ SERVER_OBJS_ := \
ifeq ($(OSTYPE), Windows) ifeq ($(OSTYPE), Windows)
SERVER_OBJS_ += \ SERVER_OBJS_ += \
src/backends/windows/mem.o \
src/backends/windows/network.o \ src/backends/windows/network.o \
src/backends/windows/system.o src/backends/windows/system.o \
src/backends/windows/shared/mem.o
else else
SERVER_OBJS_ += \ SERVER_OBJS_ += \
src/backends/unix/hunk.o \
src/backends/unix/main.o \ src/backends/unix/main.o \
src/backends/unix/network.o \ src/backends/unix/network.o \
src/backends/unix/signalhandler.o \ src/backends/unix/signalhandler.o \
src/backends/unix/system.o src/backends/unix/system.o \
src/backends/unix/shared/hunk.o
endif endif
# ---------- # ----------
@ -675,15 +675,14 @@ OPENGL_OBJS_ = \
src/refresh/files/tga.o \ src/refresh/files/tga.o \
src/refresh/files/jpeg.o \ src/refresh/files/jpeg.o \
src/refresh/files/wal.o \ src/refresh/files/wal.o \
src/common/glob.o \
src/common/shared/shared.o src/common/shared/shared.o
ifeq ($(OSTYPE), Windows) ifeq ($(OSTYPE), Windows)
OPENGL_OBJS_ += \ OPENGL_OBJS_ += \
src/backends/windows/mem.o src/backends/windows/shared/mem.o
else else
OPENGL_OBJS_ += \ OPENGL_OBJS_ += \
src/backends/unix/hunk.o src/backends/unix/shared/hunk.o
endif endif
# ---------- # ----------

2
src/backends/unix/hunk.c → src/backends/unix/shared/hunk.c
View file

@ -34,7 +34,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#include "../../common/header/common.h" #include "../../../common/header/common.h"
#if defined(__FreeBSD__) || defined(__OpenBSD__) #if defined(__FreeBSD__) || defined(__OpenBSD__)
#include <machine/param.h> #include <machine/param.h>

6
src/backends/windows/mem.c → src/backends/windows/shared/mem.c
View file

@ -24,8 +24,8 @@
* ======================================================================= * =======================================================================
*/ */
#include "../../common/header/common.h" #include "../../../common/header/common.h"
#include "header/winquake.h" #include "../header/winquake.h"
byte *membase; byte *membase;
int hunkcount; int hunkcount;
@ -35,7 +35,7 @@ int cursize;
void * void *
Hunk_Begin(int maxsize) Hunk_Begin(int maxsize)
{ {
/* reserve a huge chunk of memory, /* reserve a huge chunk of memory,
but don't commit any yet */ but don't commit any yet */
cursize = 0; cursize = 0;
hunkmaxsize = maxsize; hunkmaxsize = maxsize;