diff options
| author | Tim Angus <tim@ngus.net> | 2013-07-17 12:11:30 -0700 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-07-17 12:11:30 -0700 |
| commit | d23343534d84fba2f4c8733726a9772f75c0aa37 (patch) | |
| tree | 3d3421adc4b461dd6d25d04dbb5e8457d6adbc6b /Makefile | |
| parent | 20d4193160d01832f0632cc123fad9c2cf8cb449 (diff) | |
| parent | cfbb35a486fc4d42960d855022bd7b70df938b7b (diff) | |
Merge pull request #2 from morturp/patch-1
ui_shared.c needs to be compiled separately for the cgame module
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -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) |