summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authormorturp <morturp@gmail.com>2013-07-17 13:35:24 +0300
committermorturp <morturp@gmail.com>2013-07-17 13:35:24 +0300
commitcfbb35a486fc4d42960d855022bd7b70df938b7b (patch)
tree3d3421adc4b461dd6d25d04dbb5e8457d6adbc6b /Makefile
parent20d4193160d01832f0632cc123fad9c2cf8cb449 (diff)
ui_shared.c needs to be compiled separately for the cgame module
Otherwise "#ifdef CGAME" in it has no effect
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 679ffe64..dfe9c4b3 100644
--- a/Makefile
+++ b/Makefile
@@ -2072,7 +2072,7 @@ CGOBJ_ = \
$(B)/$(BASEGAME)/cgame/cg_trails.o \
$(B)/$(BASEGAME)/cgame/cg_particles.o \
$(B)/$(BASEGAME)/cgame/cg_tutorial.o \
- $(B)/$(BASEGAME)/ui/ui_shared.o \
+ $(B)/$(BASEGAME)/cgame/ui_shared.o \
\
$(B)/$(BASEGAME)/qcommon/q_math.o \
$(B)/$(BASEGAME)/qcommon/q_shared.o
@@ -2295,12 +2295,18 @@ endif
$(B)/$(BASEGAME)/cgame/bg_%.o: $(GDIR)/bg_%.c
$(DO_CGAME_CC)
+$(B)/$(BASEGAME)/cgame/ui_%.o: $(UIDIR)/ui_%.c
+ $(DO_CGAME_CC)
+
$(B)/$(BASEGAME)/cgame/%.o: $(CGDIR)/%.c
$(DO_CGAME_CC)
$(B)/$(BASEGAME)/cgame/bg_%.asm: $(GDIR)/bg_%.c $(Q3LCC)
$(DO_CGAME_Q3LCC)
+$(B)/$(BASEGAME)/cgame/ui_%.asm: $(UIDIR)/ui_%.c $(Q3LCC)
+ $(DO_CGAME_Q3LCC)
+
$(B)/$(BASEGAME)/cgame/%.asm: $(CGDIR)/%.c $(Q3LCC)
$(DO_CGAME_Q3LCC)