[rott-commits] r283 - in trunk: . rott rott/audiolib
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Feb 24 01:46:59 EST 2015
Author: fabian
Date: 2015-02-24 01:46:58 -0500 (Tue, 24 Feb 2015)
New Revision: 283
Added:
trunk/Makefile.am
trunk/Makefile_old
trunk/configure.ac
trunk/rott/Makefile.am
trunk/rott/Makefile_old
trunk/rott/audiolib/Makefile.am
trunk/rott/audiolib/Makefile_old
Removed:
trunk/Makefile
trunk/rott/Makefile
trunk/rott/audiolib/Makefile
Log:
use autoconf/automake
Deleted: trunk/Makefile
===================================================================
--- trunk/Makefile 2015-02-11 09:18:33 UTC (rev 282)
+++ trunk/Makefile 2015-02-24 06:46:58 UTC (rev 283)
@@ -1,33 +0,0 @@
-FLVRS=huntbgin darkwar rottcd rottsite
-ROTTS=$(addprefix rott-,$(FLVRS))
-SRCDIR=rott
-
-all: $(ROTTS)
-
-# Shareware Version
-rott-huntbgin:
- $(MAKE) -C $(SRCDIR) tidy
- $(MAKE) -C $(SRCDIR) ROTT=$@
- mv $(SRCDIR)/$@ .
-
-# Commercial Version
-rott-darkwar:
- $(MAKE) -C $(SRCDIR) tidy
- $(MAKE) -C $(SRCDIR) ROTT=$@ SHAREWARE=0
- mv $(SRCDIR)/$@ .
-
-# CD Version
-rott-rottcd:
- $(MAKE) -C $(SRCDIR) tidy
- $(MAKE) -C $(SRCDIR) ROTT=$@ SHAREWARE=0 SUPERROTT=1
- mv $(SRCDIR)/$@ .
-
-# Site License CD Version
-rott-rottsite:
- $(MAKE) -C $(SRCDIR) tidy
- $(MAKE) -C $(SRCDIR) ROTT=$@ SHAREWARE=0 SITELICENSE=1
- mv $(SRCDIR)/$@ .
-
-clean:
- $(MAKE) -C $(SRCDIR) $@
- $(RM) $(ROTTS) $(addsuffix .exe,$(ROTTS))
Added: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am (rev 0)
+++ trunk/Makefile.am 2015-02-24 06:46:58 UTC (rev 283)
@@ -0,0 +1 @@
+SUBDIRS = rott
Copied: trunk/Makefile_old (from rev 278, trunk/Makefile)
===================================================================
--- trunk/Makefile_old (rev 0)
+++ trunk/Makefile_old 2015-02-24 06:46:58 UTC (rev 283)
@@ -0,0 +1,33 @@
+FLVRS=huntbgin darkwar rottcd rottsite
+ROTTS=$(addprefix rott-,$(FLVRS))
+SRCDIR=rott
+
+all: $(ROTTS)
+
+# Shareware Version
+rott-huntbgin:
+ $(MAKE) -C $(SRCDIR) tidy
+ $(MAKE) -C $(SRCDIR) ROTT=$@
+ mv $(SRCDIR)/$@ .
+
+# Commercial Version
+rott-darkwar:
+ $(MAKE) -C $(SRCDIR) tidy
+ $(MAKE) -C $(SRCDIR) ROTT=$@ SHAREWARE=0
+ mv $(SRCDIR)/$@ .
+
+# CD Version
+rott-rottcd:
+ $(MAKE) -C $(SRCDIR) tidy
+ $(MAKE) -C $(SRCDIR) ROTT=$@ SHAREWARE=0 SUPERROTT=1
+ mv $(SRCDIR)/$@ .
+
+# Site License CD Version
+rott-rottsite:
+ $(MAKE) -C $(SRCDIR) tidy
+ $(MAKE) -C $(SRCDIR) ROTT=$@ SHAREWARE=0 SITELICENSE=1
+ mv $(SRCDIR)/$@ .
+
+clean:
+ $(MAKE) -C $(SRCDIR) $@
+ $(RM) $(ROTTS) $(addsuffix .exe,$(ROTTS))
Added: trunk/configure.ac
===================================================================
--- trunk/configure.ac (rev 0)
+++ trunk/configure.ac 2015-02-24 06:46:58 UTC (rev 283)
@@ -0,0 +1,81 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.69])
+AC_INIT([rott], [1.1.2])
+AM_INIT_AUTOMAKE([foreign no-define])
+AC_CONFIG_SRCDIR([rott/version.h])
+#AC_CONFIG_HEADERS([config.h])
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_RANLIB
+
+# Checks for libraries.
+AC_DEFINE([USE_SDL])
+PKG_CHECK_MODULES([SDL], [sdl])
+PKG_CHECK_MODULES([SDL_mixer], [SDL_mixer])
+
+# Checks for header files.
+AC_DEFINE([PLATFORM_UNIX])
+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stddef.h stdlib.h string.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_CHECK_HEADER_STDBOOL
+AC_C_INLINE
+AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_INT8_T
+AC_TYPE_SIZE_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+
+# Checks for library functions.
+AC_FUNC_ALLOCA
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_CHECK_FUNCS([memmove memset mkdir pow strcasecmp strerror strrchr strstr strtol])
+
+# Set to build the shareware version
+AC_ARG_ENABLE([shareware],
+ [AS_HELP_STRING([--enable-shareware],
+ [set to build the shareware version])],
+ [AC_DEFINE([SHAREWARE])],
+ [])
+
+# Set executable file name suffix
+AC_ARG_ENABLE([suffix],
+ [AS_HELP_STRING([--enable-suffix],
+ [set executable file name suffix])],
+ [suffix="$enableval"],
+ [suffix=no])
+
+case "$suffix" in
+no|yes)
+ suffix=
+ ;;
+*)
+ suffix=-${suffix}
+ ;;
+esac
+
+SUFFIX=${suffix}
+AC_SUBST([SUFFIX])
+
+# Set data file directory
+AC_ARG_ENABLE([datadir],
+ [AS_HELP_STRING([--enable-datadir],
+ [set data file directory])],
+ [datadir="$enableval"],
+ [datadir=no])
+
+case "$datadir" in
+no|yes)
+ ;;
+*)
+ AC_DEFINE_UNQUOTED([DATADIR], ["$datadir/"])
+ ;;
+esac
+
+AC_CONFIG_FILES([Makefile rott/Makefile rott/audiolib/Makefile])
+AC_OUTPUT
Deleted: trunk/rott/Makefile
===================================================================
--- trunk/rott/Makefile 2015-02-11 09:18:33 UTC (rev 282)
+++ trunk/rott/Makefile 2015-02-24 06:46:58 UTC (rev 283)
@@ -1,96 +0,0 @@
-# Determine which version to build
-# Leave at 0 to build the commercial/superrott/sitelicense version
-
-SHAREWARE ?= 0
-CPPFLAGS += -DSHAREWARE=$(SHAREWARE)
-
-ROTT ?= rott
-
-# Regular build flags and rules
-
-CC ?= gcc
-
-CFLAGS ?= -g -O2
-CFLAGS += -Wall -Wno-unused
-CFLAGS += $(shell sdl-config --cflags)
-CFLAGS += $(EXTRACFLAGS)
-
-CPPFLAGS += -DUSE_SDL=1
-CPPFLAGS += -DPLATFORM_UNIX=1
-CPPFLAGS += $(EXTRACPPFLAGS)
-
-LDFLAGS += $(EXTRALDFLAGS)
-
-LDLIBS += $(shell sdl-config --libs)
-LDLIBS += -lSDL_mixer
-LDLIBS += $(EXTRALDLIBS)
-
-OBJS :=
-OBJS += cin_actr.o
-OBJS += cin_efct.o
-OBJS += cin_evnt.o
-OBJS += cin_glob.o
-OBJS += cin_main.o
-OBJS += cin_util.o
-OBJS += dosutil.o
-OBJS += engine.o
-OBJS += isr.o
-OBJS += modexlib.o
-OBJS += rt_actor.o
-OBJS += rt_battl.o
-OBJS += rt_build.o
-OBJS += rt_cfg.o
-OBJS += rt_crc.o
-OBJS += rt_com.o
-OBJS += rt_debug.o
-OBJS += rt_dmand.o
-OBJS += rt_door.o
-OBJS += rt_draw.o
-OBJS += rt_floor.o
-OBJS += rt_game.o
-OBJS += rt_in.o
-OBJS += rt_main.o
-OBJS += rt_map.o
-OBJS += rt_menu.o
-OBJS += rt_msg.o
-OBJS += rt_net.o
-OBJS += rt_playr.o
-OBJS += rt_rand.o
-OBJS += rt_scale.o
-OBJS += rt_sound.o
-OBJS += rt_spbal.o
-OBJS += rt_sqrt.o
-OBJS += rt_stat.o
-OBJS += rt_state.o
-OBJS += rt_str.o
-OBJS += rt_swift.o
-OBJS += rt_ted.o
-OBJS += rt_util.o
-OBJS += rt_view.o
-OBJS += rt_vid.o
-OBJS += rt_err.o
-OBJS += scriplib.o
-OBJS += w_wad.o
-OBJS += watcom.o
-OBJS += z_zone.o
-OBJS += byteordr.o
-OBJS += dukemusc.o
-OBJS += winrott.o
-
-AUDIOLIB := audiolib/audiolib.a
-
-all: $(ROTT)
-
-$(ROTT): $(OBJS) $(AUDIOLIB)
- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
-
-$(OBJS): develop.h
-
-$(AUDIOLIB):
- $(MAKE) -C audiolib
-
-tidy:
- $(RM) $(OBJS) $(ROTT) $(ROTT).exe
-
-clean: tidy
- $(MAKE) -C audiolib $@
Added: trunk/rott/Makefile.am
===================================================================
--- trunk/rott/Makefile.am (rev 0)
+++ trunk/rott/Makefile.am 2015-02-24 06:46:58 UTC (rev 283)
@@ -0,0 +1,56 @@
+SUBDIRS = audiolib
+
+bin_PROGRAMS = rott at SUFFIX@
+rott at SUFFIX@_SOURCES = \
+ byteordr.c \
+ cin_actr.c \
+ cin_efct.c \
+ cin_evnt.c \
+ cin_glob.c \
+ cin_main.c \
+ cin_util.c \
+ dosutil.c \
+ dukemusc.c \
+ engine.c \
+ isr.c \
+ modexlib.c \
+ rt_actor.c \
+ rt_battl.c \
+ rt_build.c \
+ rt_cfg.c \
+ rt_com.c \
+ rt_crc.c \
+ rt_debug.c \
+ rt_dmand.c \
+ rt_door.c \
+ rt_draw.c \
+ rt_err.c \
+ rt_floor.c \
+ rt_game.c \
+ rt_in.c \
+ rt_main.c \
+ rt_map.c \
+ rt_menu.c \
+ rt_msg.c \
+ rt_net.c \
+ rt_playr.c \
+ rt_rand.c \
+ rt_scale.c \
+ rt_sound.c \
+ rt_spbal.c \
+ rt_sqrt.c \
+ rt_stat.c \
+ rt_state.c \
+ rt_str.c \
+ rt_swift.c \
+ rt_ted.c \
+ rt_util.c \
+ rt_vid.c \
+ rt_view.c \
+ scriplib.c \
+ watcom.c \
+ winrott.c \
+ w_wad.c \
+ z_zone.c
+rott at SUFFIX@_CFLAGS = @SDL_CFLAGS@ @SDL_mixer_CFLAGS@
+rott at SUFFIX@_LDADD = audiolib/libaudiolib.a @SDL_LIBS@ @SDL_mixer_LIBS@
Copied: trunk/rott/Makefile_old (from rev 279, trunk/rott/Makefile)
===================================================================
--- trunk/rott/Makefile_old (rev 0)
+++ trunk/rott/Makefile_old 2015-02-24 06:46:58 UTC (rev 283)
@@ -0,0 +1,96 @@
+# Determine which version to build
+# Leave at 0 to build the commercial/superrott/sitelicense version
+
+SHAREWARE ?= 0
+CPPFLAGS += -DSHAREWARE=$(SHAREWARE)
+
+ROTT ?= rott
+
+# Regular build flags and rules
+
+CC ?= gcc
+
+CFLAGS ?= -g -O2
+CFLAGS += -Wall -Wno-unused
+CFLAGS += $(shell sdl-config --cflags)
+CFLAGS += $(EXTRACFLAGS)
+
+CPPFLAGS += -DUSE_SDL=1
+CPPFLAGS += -DPLATFORM_UNIX=1
+CPPFLAGS += $(EXTRACPPFLAGS)
+
+LDFLAGS += $(EXTRALDFLAGS)
+
+LDLIBS += $(shell sdl-config --libs)
+LDLIBS += -lSDL_mixer
+LDLIBS += $(EXTRALDLIBS)
+
+OBJS :=
+OBJS += cin_actr.o
+OBJS += cin_efct.o
+OBJS += cin_evnt.o
+OBJS += cin_glob.o
+OBJS += cin_main.o
+OBJS += cin_util.o
+OBJS += dosutil.o
+OBJS += engine.o
+OBJS += isr.o
+OBJS += modexlib.o
+OBJS += rt_actor.o
+OBJS += rt_battl.o
+OBJS += rt_build.o
+OBJS += rt_cfg.o
+OBJS += rt_crc.o
+OBJS += rt_com.o
+OBJS += rt_debug.o
+OBJS += rt_dmand.o
+OBJS += rt_door.o
+OBJS += rt_draw.o
+OBJS += rt_floor.o
+OBJS += rt_game.o
+OBJS += rt_in.o
+OBJS += rt_main.o
+OBJS += rt_map.o
+OBJS += rt_menu.o
+OBJS += rt_msg.o
+OBJS += rt_net.o
+OBJS += rt_playr.o
+OBJS += rt_rand.o
+OBJS += rt_scale.o
+OBJS += rt_sound.o
+OBJS += rt_spbal.o
+OBJS += rt_sqrt.o
+OBJS += rt_stat.o
+OBJS += rt_state.o
+OBJS += rt_str.o
+OBJS += rt_swift.o
+OBJS += rt_ted.o
+OBJS += rt_util.o
+OBJS += rt_view.o
+OBJS += rt_vid.o
+OBJS += rt_err.o
+OBJS += scriplib.o
+OBJS += w_wad.o
+OBJS += watcom.o
+OBJS += z_zone.o
+OBJS += byteordr.o
+OBJS += dukemusc.o
+OBJS += winrott.o
+
+AUDIOLIB := audiolib/audiolib.a
+
+all: $(ROTT)
+
+$(ROTT): $(OBJS) $(AUDIOLIB)
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
+
+$(OBJS): develop.h
+
+$(AUDIOLIB):
+ $(MAKE) -C audiolib
+
+tidy:
+ $(RM) $(OBJS) $(ROTT) $(ROTT).exe
+
+clean: tidy
+ $(MAKE) -C audiolib $@
Deleted: trunk/rott/audiolib/Makefile
===================================================================
--- trunk/rott/audiolib/Makefile 2015-02-11 09:18:33 UTC (rev 282)
+++ trunk/rott/audiolib/Makefile 2015-02-24 06:46:58 UTC (rev 283)
@@ -1,30 +0,0 @@
-AUDIOLIB ?= audiolib.a
-
-AR ?= ar
-CC ?= gcc
-RANLIB ?= ranlib
-
-ARFLAGS ?= rcT
-CFLAGS ?= -g -O2
-CFLAGS += -Wall
-CFLAGS += $(shell sdl-config --cflags)
-
-OBJS :=
-OBJS += fx_man.o
-OBJS += dsl.o
-OBJS += ll_man.o
-OBJS += multivoc.o
-OBJS += mv_mix.o
-OBJS += mvreverb.o
-OBJS += nodpmi.o
-OBJS += pitch.o
-OBJS += user.o
-OBJS += usrhooks.o
-
-$(AUDIOLIB): $(OBJS)
- $(RM) $@
- $(AR) $(ARFLAGS) $@ $^
- $(RANLIB) $@
-
-clean:
- $(RM) $(AUDIOLIB) $(OBJS)
Added: trunk/rott/audiolib/Makefile.am
===================================================================
--- trunk/rott/audiolib/Makefile.am (rev 0)
+++ trunk/rott/audiolib/Makefile.am 2015-02-24 06:46:58 UTC (rev 283)
@@ -0,0 +1,13 @@
+noinst_LIBRARIES = libaudiolib.a
+libaudiolib_a_SOURCES = \
+ dsl.c \
+ fx_man.c \
+ ll_man.c \
+ multivoc.c \
+ mv_mix.c \
+ mvreverb.c \
+ nodpmi.c \
+ pitch.c \
+ user.c \
+ usrhooks.c
+libaudiolib_a_CFLAGS = @SDL_CFLAGS@
Copied: trunk/rott/audiolib/Makefile_old (from rev 278, trunk/rott/audiolib/Makefile)
===================================================================
--- trunk/rott/audiolib/Makefile_old (rev 0)
+++ trunk/rott/audiolib/Makefile_old 2015-02-24 06:46:58 UTC (rev 283)
@@ -0,0 +1,30 @@
+AUDIOLIB ?= audiolib.a
+
+AR ?= ar
+CC ?= gcc
+RANLIB ?= ranlib
+
+ARFLAGS ?= rcT
+CFLAGS ?= -g -O2
+CFLAGS += -Wall
+CFLAGS += $(shell sdl-config --cflags)
+
+OBJS :=
+OBJS += fx_man.o
+OBJS += dsl.o
+OBJS += ll_man.o
+OBJS += multivoc.o
+OBJS += mv_mix.o
+OBJS += mvreverb.o
+OBJS += nodpmi.o
+OBJS += pitch.o
+OBJS += user.o
+OBJS += usrhooks.o
+
+$(AUDIOLIB): $(OBJS)
+ $(RM) $@
+ $(AR) $(ARFLAGS) $@ $^
+ $(RANLIB) $@
+
+clean:
+ $(RM) $(AUDIOLIB) $(OBJS)
More information about the rott-commits
mailing list