summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2009-10-03 11:40:16 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:15:13 +0000
commitcd01b7da984dbc08cafb110ab33f432c6fe963f5 (patch)
tree7bcd7c3223e34ee789574ee02b8faee8b6668463 /Makefile
parentdc7aab757ad488f4b960e7de8750022a990a8af5 (diff)
* Consolidate memory allocation into bg_alloc.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0c4dc243..68c9ee05 100644
--- a/Makefile
+++ b/Makefile
@@ -1332,6 +1332,7 @@ CGOBJ_ = \
$(B)/base/cgame/bg_pmove.o \
$(B)/base/cgame/bg_slidemove.o \
$(B)/base/cgame/bg_lib.o \
+ $(B)/base/cgame/bg_alloc.o \
$(B)/base/cgame/cg_consolecmds.o \
$(B)/base/cgame/cg_buildable.o \
$(B)/base/cgame/cg_animation.o \
@@ -1348,7 +1349,6 @@ CGOBJ_ = \
$(B)/base/cgame/cg_snapshot.o \
$(B)/base/cgame/cg_view.o \
$(B)/base/cgame/cg_weapons.o \
- $(B)/base/cgame/cg_mem.o \
$(B)/base/cgame/cg_scanner.o \
$(B)/base/cgame/cg_attachment.o \
$(B)/base/cgame/cg_trails.o \
@@ -1383,7 +1383,7 @@ GOBJ_ = \
$(B)/base/game/bg_pmove.o \
$(B)/base/game/bg_slidemove.o \
$(B)/base/game/bg_lib.o \
- $(B)/base/game/g_mem.o \
+ $(B)/base/game/bg_alloc.o \
$(B)/base/game/g_active.o \
$(B)/base/game/g_client.o \
$(B)/base/game/g_cmds.o \