From ff94ecfca92f893648bd2ad6b4f99f0f14fa257a Mon Sep 17 00:00:00 2001 From: Jamie Wilkinson Date: Thu, 18 Mar 2004 01:27:30 +0000 Subject: [PATCH] - Uncomment conditional sections of rogue and xatrix. - Update todo list. --- TODO | 1 - src/rogue/Makefile.am | 56 +++++++++++++++++++++--------------------- src/xatrix/Makefile.am | 46 +++++++++++++++++----------------- 3 files changed, 51 insertions(+), 52 deletions(-) diff --git a/TODO b/TODO index 6425511..5438cf5 100644 --- a/TODO +++ b/TODO @@ -11,7 +11,6 @@ - investigate the possibility of savegames not being tied to a particular build - split out assembler per arch/os (we currently have gas i386 and win i386) - make sure that we give back the mouse and keyboard if the game crashes -- split out the sound code into separate modules, like the vid_refs already do - dynamically get video resolutions from the X server (or SVGAlib or whatever) instead of hardcoding them... or do both - have a look at http://bw-admin.sourceforge.net/ and diff --git a/src/rogue/Makefile.am b/src/rogue/Makefile.am index 6394b10..d6cf8b4 100644 --- a/src/rogue/Makefile.am +++ b/src/rogue/Makefile.am @@ -1,32 +1,32 @@ pkglibdir=$(libdir)/@PACKAGE@/rogue if DO_ROGUE -#pkglib_LTLIBRARIES = game.la -#game_la_SOURCES = dm_ball.c dm_tag.c \ -# g_ai.c g_chase.c g_cmds.c g_combat.c g_func.c \ -# g_items.c g_main.c g_misc.c g_monster.c g_newai.c \ -# g_newdm.c g_newfnc.c g_newtarg.c g_newtrig.c \ -# g_newweap.c g_phys.c g_save.c g_spawn.c g_sphere.c \ -# g_svcmds.c g_target.c g_trigger.c g_turret.c \ -# g_utils.c g_weapon.c \ -# m_actor.c m_berserk.c m_boss2.c m_boss3.c \ -# m_boss31.c m_boss32.c m_brain.c m_carrier.c \ -# m_chick.c m_flash.c m_flipper.c m_float.c m_flyer.c \ -# m_gladiator.c m_gunner.c m_hover.c m_infantry.c \ -# m_insane.c m_medic.c m_move.c m_mutant.c \ -# m_parasite.c m_soldier.c m_stalker.c m_supertank.c \ -# m_tank.c m_turret.c m_widow.c m_widow2.c \ -# p_client.c p_hud.c p_trail.c p_view.c p_weapon.c \ -# q_shared.c -# -#noinst_HEADERS = g_local.h m_actor.h m_berserk.h m_boss2.h m_boss31.h \ -# m_boss32.h m_brain.h m_carrier.h m_chick.h m_flipper.h \ -# m_float.h m_flyer.h m_gladiator.h m_gunner.h m_hover.h \ -# m_infantry.h m_insane.h m_medic.h m_mutant.h m_parasite.h \ -# m_player.h m_rider.h m_soldier.h m_stalker.h m_supertank.h \ -# m_tank.h m_turret.h m_widow.h m_widow2.h q_shared.h -# -##game_la_CFLAGS = -fPIC -Wall -Werror -pipe @OPT_CFLAGS@ -#game_la_CFLAGS = -I$(top_srcdir)/src -fPIC -pipe @OPT_CFLAGS@ -#game_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir) +pkglib_LTLIBRARIES = game.la +game_la_SOURCES = dm_ball.c dm_tag.c \ + g_ai.c g_chase.c g_cmds.c g_combat.c g_func.c \ + g_items.c g_main.c g_misc.c g_monster.c g_newai.c \ + g_newdm.c g_newfnc.c g_newtarg.c g_newtrig.c \ + g_newweap.c g_phys.c g_save.c g_spawn.c g_sphere.c \ + g_svcmds.c g_target.c g_trigger.c g_turret.c \ + g_utils.c g_weapon.c \ + m_actor.c m_berserk.c m_boss2.c m_boss3.c \ + m_boss31.c m_boss32.c m_brain.c m_carrier.c \ + m_chick.c m_flash.c m_flipper.c m_float.c m_flyer.c \ + m_gladiator.c m_gunner.c m_hover.c m_infantry.c \ + m_insane.c m_medic.c m_move.c m_mutant.c \ + m_parasite.c m_soldier.c m_stalker.c m_supertank.c \ + m_tank.c m_turret.c m_widow.c m_widow2.c \ + p_client.c p_hud.c p_trail.c p_view.c p_weapon.c \ + q_shared.c + +noinst_HEADERS = g_local.h m_actor.h m_berserk.h m_boss2.h m_boss31.h \ + m_boss32.h m_brain.h m_carrier.h m_chick.h m_flipper.h \ + m_float.h m_flyer.h m_gladiator.h m_gunner.h m_hover.h \ + m_infantry.h m_insane.h m_medic.h m_mutant.h m_parasite.h \ + m_player.h m_rider.h m_soldier.h m_stalker.h m_supertank.h \ + m_tank.h m_turret.h m_widow.h m_widow2.h q_shared.h + +#game_la_CFLAGS = -fPIC -Wall -Werror -pipe @OPT_CFLAGS@ +game_la_CFLAGS = -I$(top_srcdir)/src -fPIC -pipe @OPT_CFLAGS@ +game_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir) endif # DO_ROGUE diff --git a/src/xatrix/Makefile.am b/src/xatrix/Makefile.am index c64d01b..7e7f036 100644 --- a/src/xatrix/Makefile.am +++ b/src/xatrix/Makefile.am @@ -1,29 +1,29 @@ pkglibdir=$(libdir)/@PACKAGE@/xatrix if DO_XATRIX -#pkglib_LTLIBRARIES = game.la -#game_la_SOURCES = g_ai.c g_chase.c g_cmds.c g_combat.c g_func.c \ -# g_items.c g_main.c g_misc.c g_monster.c g_phys.c \ -# g_save.c g_spawn.c g_svcmds.c g_target.c g_trigger.c \ -# g_turret.c g_utils.c g_weapon.c \ -# m_actor.c m_berserk.c m_boss2.c m_boss3.c \ -# m_boss31.c m_boss32.c m_boss5.c m_brain.c \ -# m_chick.c m_fixbot.c m_flash.c m_flipper.c \ -# m_float.c m_flyer.c m_gekk.c m_gladb.c \ -# m_gladiator.c m_gunner.c m_hover.c m_infantry.c \ -# m_insane.c m_medic.c m_move.c m_mutant.c \ -# m_parasite.c m_soldier.c m_supertank.c m_tank.c \ -# p_client.c p_hud.c p_trail.c p_view.c p_weapon.c \ -# q_shared.c +pkglib_LTLIBRARIES = game.la +game_la_SOURCES = g_ai.c g_chase.c g_cmds.c g_combat.c g_func.c \ + g_items.c g_main.c g_misc.c g_monster.c g_phys.c \ + g_save.c g_spawn.c g_svcmds.c g_target.c g_trigger.c \ + g_turret.c g_utils.c g_weapon.c \ + m_actor.c m_berserk.c m_boss2.c m_boss3.c \ + m_boss31.c m_boss32.c m_boss5.c m_brain.c \ + m_chick.c m_fixbot.c m_flash.c m_flipper.c \ + m_float.c m_flyer.c m_gekk.c m_gladb.c \ + m_gladiator.c m_gunner.c m_hover.c m_infantry.c \ + m_insane.c m_medic.c m_move.c m_mutant.c \ + m_parasite.c m_soldier.c m_supertank.c m_tank.c \ + p_client.c p_hud.c p_trail.c p_view.c p_weapon.c \ + q_shared.c -#noinst_HEADERS = g_local.h m_actor.h m_berserk.h m_boss2.h m_boss31.h \ -# m_boss32.h m_brain.h m_chick.h m_fixbot.h m_flipper.h \ -# m_float.h m_flyer.h m_gekk.h m_gladiator.h m_gunner.h \ -# m_hover.h m_infantry.h m_insane.h m_medic.h m_mutant.h \ -# m_parasite.h m_player.h m_rider.h m_soldier.h m_soldierh.h \ -# m_supertank.h m_tank.h q_shared.h +noinst_HEADERS = g_local.h m_actor.h m_berserk.h m_boss2.h m_boss31.h \ + m_boss32.h m_brain.h m_chick.h m_fixbot.h m_flipper.h \ + m_float.h m_flyer.h m_gekk.h m_gladiator.h m_gunner.h \ + m_hover.h m_infantry.h m_insane.h m_medic.h m_mutant.h \ + m_parasite.h m_player.h m_rider.h m_soldier.h m_soldierh.h \ + m_supertank.h m_tank.h q_shared.h -##game_la_CFLAGS = -fPIC -Wall -Werror -pipe @OPT_CFLAGS@ -#game_la_CFLAGS = -I$(top_srcdir)/src -fPIC -pipe @OPT_CFLAGS@ -#game_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir) +#game_la_CFLAGS = -fPIC -Wall -Werror -pipe @OPT_CFLAGS@ +game_la_CFLAGS = -I$(top_srcdir)/src -fPIC -pipe @OPT_CFLAGS@ +game_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir) endif # DO_XATRIX