yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-21 11:21:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Let ctf use the files in common/

Browse source
This commit is contained in:
Yamagi Burmeister 2011-10-06 09:13:56 +00:00
parent feaa8a6f21
commit 7274f27131
4 changed files with 12 additions and 2302 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Makefile
View file

@ -292,10 +292,9 @@ CTF_OBJS_ = \
src/game/ctf/p_menu.o \ src/game/ctf/p_menu.o \
src/game/ctf/p_trail.o \ src/game/ctf/p_trail.o \
src/game/ctf/p_view.o \ src/game/ctf/p_view.o \
src/game/ctf/p_weapon.o \ src/game/ctf/p_weapon.o
src/game/ctf/q_shared.o
# Used by the client, the server and the games # Used by the client, the server and baseq2
GAME_ABI_OBJS_ := \ GAME_ABI_OBJS_ := \
src/common/shared/flash.o \ src/common/shared/flash.o \
src/common/shared/shared.o src/common/shared/shared.o
@ -319,8 +318,8 @@ OPENGL_OBJS_ = \
src/refresh/files/tga.o \ src/refresh/files/tga.o \
src/refresh/files/wal.o src/refresh/files/wal.o
# Used by the OpenGL refresher # Used by the OpenGL refresher and ctf
OPENGL_GAME_ABI_OBJS_ = \ LIGHT_GAME_ABI_OBJS_ = \
src/common/shared/shared.o src/common/shared/shared.o
# Used by the client # Used by the client
@ -386,14 +385,15 @@ SERVER_GAME_ABI_OBJS = $(patsubst %,build/server/%,$(GAME_ABI_OBJS_))
UNIX_SERVER_OBJS= $(patsubst %,build/server/%,$(UNIX_SERVER_OBJS_)) UNIX_SERVER_OBJS= $(patsubst %,build/server/%,$(UNIX_SERVER_OBJS_))
OPENGL_OBJS = $(patsubst %,build/refresher/%,$(OPENGL_OBJS_)) OPENGL_OBJS = $(patsubst %,build/refresher/%,$(OPENGL_OBJS_))
OPENGL_GAME_ABI_OBJS = $(patsubst %,build/refresher/%,$(OPENGL_GAME_ABI_OBJS_)) OPENGL_GAME_ABI_OBJS = $(patsubst %,build/refresher/%,$(LIGHT_GAME_ABI_OBJS_))
UNIX_OPENGL_OBJS = $(patsubst %,build/refresher/%,$(UNIX_OPENGL_OBJS_)) UNIX_OPENGL_OBJS = $(patsubst %,build/refresher/%,$(UNIX_OPENGL_OBJS_))
SDL_OPENGL_OBJS = $(patsubst %,build/refresher/%,$(SDL_OPENGL_OBJS_)) SDL_OPENGL_OBJS = $(patsubst %,build/refresher/%,$(SDL_OPENGL_OBJS_))
BASEQ2_OBJS = $(patsubst %,build/baseq2/%,$(BASEQ2_OBJS_)) BASEQ2_OBJS = $(patsubst %,build/baseq2/%,$(BASEQ2_OBJS_))
BASEQ2_GAME_ABI_OBJS = $(patsubst %,build/baseq2/%,$(GAME_ABI_OBJS_)) BASEQ2_GAME_ABI_OBJS = $(patsubst %,build/baseq2/%,$(GAME_ABI_OBJS_))
CTF_OBJS = $(patsubst %,build/baseq2/%,$(CTF_OBJS_)) CTF_OBJS = $(patsubst %,build/ctf/%,$(LIGHT_GAME_ABI_OBJS_))
CTF_GAME_ABI_OBJS = $(patsubst %,build/ctf/%,$(CTF_OBJS_))
# ---------- # ----------
@ -419,6 +419,7 @@ BASEQ2_DEPS= $(BASEQ2_OBJS:.o=.d)
BASEQ2_GAME_ABI_DEPS= $(BASEQ2_GAME_ABI_OBJS:.o=.d) BASEQ2_GAME_ABI_DEPS= $(BASEQ2_GAME_ABI_OBJS:.o=.d)
CTF_DEPS= $(CTF_OBJS:.o=.d) CTF_DEPS= $(CTF_OBJS:.o=.d)
CTF_GAME_ABI_DEPS= $(CTF_GAME_ABI_OBJS:.o=.d)
# ---------- # ----------
@ -444,6 +445,7 @@ CTF_DEPS= $(CTF_OBJS:.o=.d)
-include $(BASEQ2_GAME_ABI_DEPS) -include $(BASEQ2_GAME_ABI_DEPS)
-include $(CTF_DEPS) -include $(CTF_DEPS)
-include $(CTF_GAME_ABI_DEPS)
# ---------- # ----------
@ -475,8 +477,8 @@ release/baseq2/game.so : $(BASEQ2_OBJS) $(BASEQ2_GAME_ABI_OBJS)
@$(CC) $(LDFLAGS) -o $@ $(BASEQ2_OBJS) $(BASEQ2_GAME_ABI_OBJS) @$(CC) $(LDFLAGS) -o $@ $(BASEQ2_OBJS) $(BASEQ2_GAME_ABI_OBJS)
# release/ctf/game.so # release/ctf/game.so
release/ctf/game.so : $(CTF_OBJS) release/ctf/game.so : $(CTF_OBJS) $(CTF_GAME_ABI_OBJS)
@echo '===> LD $@' @echo '===> LD $@'
@$(CC) $(LDFLAGS) -o $@ $(CTF_OBJS) @$(CC) $(LDFLAGS) -o $@ $(CTF_OBJS) $(CTF_GAME_ABI_OBJS)
# ---------- # ----------

2
src/game/ctf/g_local.h
View file

@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// g_local.h -- local definitions for game module // g_local.h -- local definitions for game module
#include "q_shared.h" #include "../../common/header/shared.h"
// define GAME_INCLUDE so that game.h does not define the // define GAME_INCLUDE so that game.h does not define the
// short, server-visible gclient_t and edict_t structures, // short, server-visible gclient_t and edict_t structures,

1140
src/game/ctf/q_shared.c
View file

File diff suppressed because it is too large Load diff

1152
src/game/ctf/q_shared.h
View file

File diff suppressed because it is too large Load diff