hopefully better library arrangement

This commit is contained in:
Bill Currie 2004-02-03 06:00:16 +00:00
parent 1542268d40
commit a4bcf2dab6
3 changed files with 17 additions and 13 deletions

View file

@ -40,8 +40,8 @@ menu_src= \
menu_obj=$(addsuffix .qfo,$(basename $(menu_src)))
menu.dat$(GZ): $(menu_obj) $(QFCC_DEP) ../lib/libgui.a ../lib/libcsqc.a ../lib/libr.a
$(QFCC) $(QCFLAGS) -p $(STRIP) -o menu.dat $(menu_obj) ../lib/libgui.a ../lib/libcsqc.a ../lib/libr.a
menu.dat$(GZ): $(menu_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a
$(QFCC) $(QCFLAGS) -p $(STRIP) -o menu.dat $(menu_obj) ../lib/libcsqc.a ../lib/libr.a
$(GZIP)
EXTRA_DIST= $(menu_src) \

View file

@ -36,8 +36,8 @@ game_src= Axe.r GameEntity.r World.r tempent.r
game_obj=$(addsuffix .qfo,$(basename $(game_src)))
game.dat$(GZ): $(game_obj) ../lib/libr.a
$(QFCC) $(QCFLAGS) -p $(STRIP) -o game.dat $(game_obj) ../lib/libr.a
game.dat$(GZ): $(game_obj) ../lib/libr.a ../lib/libqw.a
$(QFCC) $(QCFLAGS) -p $(STRIP) -o game.dat $(game_obj) ../lib/libqw.a ../lib/libr.a
$(GZIP)
EXTRA_DIST= $(game_src) Axe.h GameEntity.h tempent.h Weapon.h World.h

View file

@ -10,7 +10,7 @@ RANLIB=touch
INCLUDES= -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
ruamoko_libs=libr.a libgui.a libcsqc.a
ruamoko_libs=libr.a libqw.a libnq.a libcsqc.a
if BUILD_RUAMOKO
libs=$(ruamoko_libs)
else
@ -27,20 +27,24 @@ EXTRA_LIBRARIES= $(ruamoko_libs)
$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
libr_a_SOURCES=\
crudefile.r debug.r hash.r entities.r infokey.r math.r message.r \
nq_message.r physics.r plist.r qfile.r qw_message.r qw_physics.r qw_sys.r \
server.r sound.r \
string.r system.r \
cbuf.r cmd.r cvar.r file.r qfile.r string.r \
Object.r AutoreleasePool.r Array.r Entity.r List.r ListNode.r Point.r \
Rect.r Size.r Stack.r
libr_a_AR=$(PAK) -cf
libgui_a_SOURCES=\
draw.r InputLine.r key.r
libgui_a_AR=$(PAK) -cf
libqw_a_SOURCES=\
crudefile.r debug.r hash.r entities.r infokey.r math.r message.r \
physics.r plist.r qw_message.r qw_physics.r qw_sys.r \
server.r sound.r system.r
libqw_a_AR=$(PAK) -cf
libnq_a_SOURCES=\
crudefile.r debug.r hash.r entities.r infokey.r math.r message.r \
nq_message.r physics.r plist.r server.r sound.r system.r
libnq_a_AR=$(PAK) -cf
libcsqc_a_SOURCES= \
cbuf.r cmd.r cvar.r file.r gib.r
draw.r gib.r InputLine.r key.r system.r
libcsqc_a_AR= $(PAK) -cf
CLEANFILES= *.qfo *.o