mirror of
https://git.code.sf.net/p/quake/game-source
synced 2025-04-16 04:30:59 +00:00
get the generated files generating properly and work around some issues
caused by changes in cpp
This commit is contained in:
Bill Currie
parent
88c055ea3c
commit
8b5c6b324e
8 changed files with 19 additions and 164 deletions
4
klik/.gitignore
vendored
Normal file
4
klik/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
*.qfo
|
||||
Makefile.deps
|
||||
equipid.qc
|
||||
equipid.qh
|
||||
|
|
@ -6,7 +6,7 @@ DEBUG=0
|
|||
###############################################
|
||||
|
||||
CPP=cpp
|
||||
CPPFLAGS=-I.
|
||||
CPPFLAGS=-I. -Iweapons -Imdl -Iact -Imapents
|
||||
|
||||
QFCC=qfcc
|
||||
QFCCFLAGS=-q --warn all --code v6only $(CPPFLAGS)
|
||||
|
|
@ -33,6 +33,7 @@ MAPENTS_SOURCES=mapents_util.qc \
|
|||
|
||||
COMMON_SOURCES=system.qc \
|
||||
\
|
||||
equipid.qc \
|
||||
server.qc worldspawn.qc \
|
||||
client.qc spectate.qc \
|
||||
math.qc \
|
||||
|
|
@ -42,20 +43,20 @@ COMMON_SOURCES=system.qc \
|
|||
menu.qc menus.qc \
|
||||
override.qc \
|
||||
\
|
||||
$(prefix weapons/, $(WEAPONS_SOURCES)) \
|
||||
$(prefix act/, $(ACT_SOURCES)) \
|
||||
$(prefix mdl/, $(MDL_SOURCES)) \
|
||||
$(prefix mapents/, $(MAPENTS_SOURCES))
|
||||
$(addprefix weapons/, $(WEAPONS_SOURCES)) \
|
||||
$(addprefix act/, $(ACT_SOURCES)) \
|
||||
$(addprefix mdl/, $(MDL_SOURCES)) \
|
||||
$(addprefix mapents/, $(MAPENTS_SOURCES))
|
||||
|
||||
DEBUG_SOURCES= debug.qc entnum.qc
|
||||
|
||||
ifeq ($(GAME),qw)
|
||||
PROGS=../qwprogs.dat
|
||||
CPPFLAGS+=-DSYSTEM_DIR=\"qw/\"
|
||||
CPPFLAGS+=-I qw
|
||||
SOURCES=$(QW_SOURCES) $(COMMON_SOURCES)
|
||||
else
|
||||
PROGS=../progs.dat
|
||||
CPPFLAGS+=-DSYSTEM_DIR=\"nq/\"
|
||||
CPPFLAGS+=-I nq
|
||||
SOURCES=$(NQ_SOURCES) $(COMMON_SOURCES)
|
||||
endif
|
||||
|
||||
|
|
@ -66,7 +67,7 @@ endif
|
|||
|
||||
OBJECTS=$(SOURCES:.qc=.qfo)
|
||||
|
||||
GENERATED_SOURCES = equipid.qh equipid.qc weapon_g.qc
|
||||
GENERATED_SOURCES = equipid.qh equipid.qc weapons/weapon_g.qc
|
||||
|
||||
all: $(PROGS)
|
||||
|
||||
|
|
@ -76,8 +77,8 @@ $(PROGS): $(OBJECTS)
|
|||
$(QFCC) $(QFCCFLAGS) -o $@ $^
|
||||
|
||||
WEAPON_G_SOURCES=$(filter w_%.qc,$(SOURCES))
|
||||
weapon_g.qc: weapon_gen.sh $(WEAPON_G_SOURCES)
|
||||
bash weapon_gen.sh $(WEAPON_G_SOURCES) > $@
|
||||
weapons/weapon_g.qc: weapons/weapon_gen.sh $(WEAPON_G_SOURCES)
|
||||
bash weapons/weapon_gen.sh $(WEAPON_G_SOURCES) > $@
|
||||
|
||||
EQUIPID_SOURCES=$(filter-out $(GENERATED_SOURCES),$(SOURCES))
|
||||
equipid.qh equipid.qc: equipid_gen.pl Makefile $(EQUIPID_SOURCES)
|
||||
|
|
|
|||
|
|
@ -1,139 +0,0 @@
|
|||
# Use 'make dep' to generate this file
|
||||
../qwprogs.dat: system.qc
|
||||
../qwprogs.dat: server.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
server.qh damage.qh bodyque.qh weapon.qh weapon_g.qh mdl.qh client.qh \
|
||||
mdl_player.qh mdl_eyes.qh act_player.qh delays.qh
|
||||
../qwprogs.dat: worldspawn.qc common.qh system.qh system.qc \
|
||||
builtins.qh builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh \
|
||||
config.qh
|
||||
../qwprogs.dat: client.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
override.qh mdl.qh mdl_player.qh mdl_void.qh act_player.qh \
|
||||
act_dead.qh equip.qh equipid.qh items.qh menu.qh menus.qh weapon.qh \
|
||||
weapon_g.qh server.qh damage.qh teleport.qh
|
||||
../qwprogs.dat: spectate.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh
|
||||
../qwprogs.dat: refcount.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh
|
||||
../qwprogs.dat: sz_watch.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
server.qh protocol.qh
|
||||
../qwprogs.dat: math.qc math.qh
|
||||
../qwprogs.dat: entnum.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
server.qh entnum.qh
|
||||
../qwprogs.dat: misc.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
protocol.qh teleport.qh
|
||||
../qwprogs.dat: effect.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
protocol.qh effect.qh
|
||||
../qwprogs.dat: teleport.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
mapents_util.qh damage.qh effect.qh teleport.qh
|
||||
../qwprogs.dat: delays.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
server.qh delays.qh
|
||||
../qwprogs.dat: bodyque.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
damage.qh effect.qh mdl.qh bodyque.qh
|
||||
../qwprogs.dat: damage.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
damage.qh
|
||||
../qwprogs.dat: equip.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
equip.qh equipid.qh math.qh
|
||||
../qwprogs.dat: equipid.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
equip.qh equipid.qh
|
||||
../qwprogs.dat: weapon.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
weapon.qh weapon_g.qh mdl.qh
|
||||
../qwprogs.dat: weapon_g.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
weapon.qh weapon_g.qh mdl.qh
|
||||
../qwprogs.dat: w_void.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
weapon.qh weapon_g.qh mdl.qh
|
||||
../qwprogs.dat: w_axe.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
weapon.qh weapon_g.qh mdl.qh damage.qh effect.qh
|
||||
../qwprogs.dat: w_shotgun.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
weapon.qh weapon_g.qh mdl.qh equip.qh equipid.qh damage.qh effect.qh
|
||||
../qwprogs.dat: w_nailgun.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
weapon.qh weapon_g.qh mdl.qh equip.qh equipid.qh damage.qh
|
||||
../qwprogs.dat: w_grenade_launcher.qc common.qh system.qh \
|
||||
system.qc builtins.qh builtins.qc refcount.qh sz_watch.qh misc.qh \
|
||||
defs.qh config.qh weapon.qh weapon_g.qh mdl.qh equip.qh equipid.qh \
|
||||
damage.qh effect.qh
|
||||
../qwprogs.dat: w_rocket_launcher.qc common.qh system.qh \
|
||||
system.qc builtins.qh builtins.qc refcount.qh sz_watch.qh misc.qh \
|
||||
defs.qh config.qh weapon.qh weapon_g.qh mdl.qh equip.qh equipid.qh \
|
||||
damage.qh effect.qh
|
||||
../qwprogs.dat: w_lightning_gun.qc common.qh system.qh system.qc \
|
||||
builtins.qh builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh \
|
||||
config.qh weapon.qh weapon_g.qh mdl.qh equip.qh equipid.qh damage.qh \
|
||||
effect.qh
|
||||
../qwprogs.dat: act.qc common.qh system.qh system.qc builtins.qh builtins.qc \
|
||||
refcount.qh sz_watch.qh misc.qh defs.qh config.qh act.qh items.qh \
|
||||
damage.qh server.qh
|
||||
../qwprogs.dat: act_player.qc common.qh system.qh system.qc \
|
||||
builtins.qh builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh \
|
||||
config.qh damage.qh mdl.qh client.qh items.qh weapon.qh weapon_g.qh \
|
||||
equip.qh equipid.qh act.qh act_player.qh override.qh
|
||||
../qwprogs.dat: act_dead.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
client.qh weapon.qh weapon_g.qh mdl.qh damage.qh act.qh items.qh \
|
||||
act_dead.qh override.qh
|
||||
../qwprogs.dat: mdl.qc common.qh system.qh system.qc builtins.qh builtins.qc \
|
||||
refcount.qh sz_watch.qh misc.qh defs.qh config.qh bodyque.qh mdl.qh
|
||||
../qwprogs.dat: mdl_void.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh mdl.qh \
|
||||
mdl_void.qh
|
||||
../qwprogs.dat: mdl_player.qc common.qh system.qh system.qc \
|
||||
builtins.qh builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh \
|
||||
config.qh mdl.qh mdl_player.qh
|
||||
../qwprogs.dat: mdl_eyes.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh mdl.qh \
|
||||
mdl_eyes.qh
|
||||
../qwprogs.dat: menu.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh menu.qh \
|
||||
menus.qh
|
||||
../qwprogs.dat: menus.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh menu.qh \
|
||||
menus.qh
|
||||
../qwprogs.dat: override.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
items.qh damage.qh teleport.qh override.qh
|
||||
../qwprogs.dat: mapents_util.qc common.qh system.qh system.qc \
|
||||
builtins.qh builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh \
|
||||
config.qh mapents_util.qh
|
||||
../qwprogs.dat: mapents.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
mapents_util.qh damage.qh
|
||||
../qwprogs.dat: items.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
mapents_util.qh items.qh
|
||||
../qwprogs.dat: mapents_triggers.qc common.qh system.qh \
|
||||
system.qc builtins.qh builtins.qc refcount.qh sz_watch.qh misc.qh \
|
||||
defs.qh config.qh mapents_util.qh damage.qh mapents_triggers.qh
|
||||
../qwprogs.dat: mapents_movewall.qc common.qh system.qh \
|
||||
system.qc builtins.qh builtins.qc refcount.qh sz_watch.qh misc.qh \
|
||||
defs.qh config.qh mapents_util.qh damage.qh mapents_movewall.qh
|
||||
../qwprogs.dat: mapents_traps.qc common.qh system.qh system.qc \
|
||||
builtins.qh builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh \
|
||||
config.qh mapents_util.qh damage.qh effect.qh
|
||||
../qwprogs.dat: id_compat.qc common.qh system.qh system.qc builtins.qh \
|
||||
builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh config.qh \
|
||||
mapents_util.qh items.qh mapents_triggers.qh mapents_items.qh \
|
||||
mapents_movewall.qh equip.qh equipid.qh
|
||||
../qwprogs.dat: mapents_items.qc common.qh system.qh system.qc \
|
||||
builtins.qh builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh \
|
||||
config.qh mapents_util.qh items.qh mapents_items.qh
|
||||
../qwprogs.dat: mapents_powerup.qc common.qh system.qh system.qc \
|
||||
builtins.qh builtins.qc refcount.qh sz_watch.qh misc.qh defs.qh \
|
||||
config.qh mapents_util.qh items.qh override.qh damage.qh equip.qh \
|
||||
equipid.qh mapents_powerup.qh math.qh
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#ifndef BUILTINS_qh
|
||||
#define BUILTINS_qh 1
|
||||
|
||||
#include SYSTEM_DIR "builtins.qh"
|
||||
|
||||
#endif
|
||||
|
|
@ -48,7 +48,7 @@ type1 _passthru_##func = { \
|
|||
local entity ovr; \
|
||||
ovr = override_findself(); \
|
||||
if (ovr.func) \
|
||||
return ovr.func##args; \
|
||||
return ovr.func args; \
|
||||
return val; \
|
||||
}
|
||||
|
||||
|
|
@ -58,7 +58,7 @@ all_funcs();
|
|||
|
||||
/* for the override_set_FUNCTION macros in override.qh */
|
||||
#define one_type(type1,type2) \
|
||||
void(entity e, .##type1 fld, type1 func) override_set_##type2 = {\
|
||||
void(entity e, .type1 fld, type1 func) override_set_##type2 = {\
|
||||
if (e.overrider) \
|
||||
e.overrider.fld = func; \
|
||||
else \
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
#ifndef PROTOCOL_qh
|
||||
#define PROTOCOL_qh 1
|
||||
|
||||
#include SYSTEM_DIR "protocol.qh"
|
||||
|
||||
#endif
|
||||
|
|
@ -5,4 +5,4 @@
|
|||
#include "system.qc"
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
1
klik/weapons/.gitignore
vendored
Normal file
1
klik/weapons/.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
weapon_g.qc
|
||||
Loading…
Reference in a new issue