commit 2e0b647dbdf0ab21342c751c63eb4503f9d47dca
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Sep 20 22:15:54 2008 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sat Sep 20 22:15:54 2008 +0000
Add chocolate-heretic, chocolate-hexen build targets.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1257
---
src/Makefile.am | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index d9dfc326..820c9d64 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS=doom heretic hexen
gamesdir = $(prefix)/games
+EXTRA_PROGRAMS = chocolate-heretic chocolate-hexen
games_PROGRAMS = chocolate-doom chocolate-server
AM_CFLAGS = -Idoom -I../textscreen -I../pcsound @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ -Werror
@@ -102,19 +103,37 @@ SOURCE_FILES = $(MAIN_SOURCE_FILES) \
$(FEATURE_WAD_MERGE_SOURCE_FILES) \
$(FEATURE_SOUND_SOURCE_FILES)
+EXTRA_LIBS = \
+ ../textscreen/libtextscreen.a \
+ ../pcsound/libpcsound.a \
+ @LDFLAGS@ \
+ @SDL_LIBS@ \
+ @SDLMIXER_LIBS@ \
+ @SDLNET_LIBS@
+
if HAVE_WINDRES
chocolate_doom_SOURCES=$(SOURCE_FILES) resource.rc
else
chocolate_doom_SOURCES=$(SOURCE_FILES)
endif
-chocolate_doom_LDADD = doom/libdoom.a \
- ../textscreen/libtextscreen.a \
- ../pcsound/libpcsound.a \
- @LDFLAGS@ \
- @SDL_LIBS@ \
- @SDLMIXER_LIBS@ \
- @SDLNET_LIBS@
+chocolate_doom_LDADD = doom/libdoom.a $(EXTRA_LIBS)
+
+if HAVE_WINDRES
+chocolate_heretic_SOURCES=$(SOURCE_FILES) resource.rc
+else
+chocolate_heretic_SOURCES=$(SOURCE_FILES)
+endif
+
+chocolate_heretic_LDADD = heretic/libheretic.a $(EXTRA_LIBS)
+
+if HAVE_WINDRES
+chocolate_hexen_SOURCES=$(SOURCE_FILES) resource.rc
+else
+chocolate_hexen_SOURCES=$(SOURCE_FILES)
+endif
+
+chocolate_hexen_LDADD = hexen/libhexen.a $(EXTRA_LIBS)
EXTRA_DIST = \
icon.c \