renamed config.h -> vorconfig.h and Makefile -> Makefile.in

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index 555fb96..0000000
--- a/Makefile
+++ /dev/null
@@ -1,138 +0,0 @@
-#   Variations on Rockdodger
-#   Copyright (C) 2004  Joshua Grams <josh@qualdan.com>
-
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-prefix = /usr/local
-exec_prefix = $(prefix)
-
-datarootdir = $(prefix)/share
-pkgdatadir = $(datarootdir)/vor
-bindir = $(exec_prefix)/bin
-
-CFLAGS := -Wall -O3
-LDFLAGS := 
-
-paths := -DDATA_PREFIX=\"$(pkgdatadir)\"
-sdl-cflags := $(shell sdl-config --cflags)
-sdl-ldflags := $(shell sdl-config --libs)
-
-ldflags := $(sdl-ldflags) -lSDL_image -lSDL_mixer $(LDFLAGS)
-cflags := $(sdl-cflags) $(paths) $(CFLAGS)
-
-my_objects := args.o dust.o file.o mt.o rocks.o score.o sprite.o sound.o autopilot.o
-my_objects += main.o
-libs := font.o
-objects := $(libs) $(my_objects)
-
-rocks := 00 01 02 03 04 05 06 07 08 09
-rocks += 10 11 12 13 14 15 16 17 18 19
-rocks += 20 21 22 23 24 25 26 27 28 29
-rocks += 30 31 32 33 34 35 36 37 38 39
-rocks += 40 41 42 43 44 45 46 47 48 49
-rocks := $(rocks:%=data/rock%.png)
-graphics := data/ship.png data/icon.png data/life.png data/font.png $(rocks)
-
-INSTALL := install
-INSTALL_PROGRAM := $(INSTALL)
-INSTALL_DATA := $(INSTALL) -m 644
-
-
-.PHONY: all clean maintainer-clean install uninstall
-.PHONY: mkinstalldirs rminstalldirs
-.PHONY: program program-clean install-program uninstall-program
-.PHONY: data data-clean install-data uninstall-data
-
-.INTERMEDIATE: font_guts font_guts.pov
-
-all: program data
-
-data: $(graphics)
-
-program: vor
-
-%.o: %.c
-       $(CC) $(cflags) -c -o $@ $<
-
-$(my_objects): config.h
-
-font.o: font.h
-
-args.o: args.h
-
-dust.o: globals.h dust.h float.h mt.h
-
-file.o: file.h common.h
-
-main.o: args.h common.h dust.h file.h float.h globals.h mt.h rocks.h score.h sprite.h sound.h autopilot.h
-
-mt.o: mt.h
-
-rocks.o: rocks.h common.h file.h globals.h mt.h sprite.h
-
-score.o: score.h common.h file.h
-
-sound.o: sound.h args.h common.h
-
-sprite.o: sprite.h common.h
-
-vor: $(objects)
-       $(CC) $^ $(ldflags) -o $@
-
-include gfx.mk
-
-tags: *.c *.h
-       exuberant-ctags *.c *.h /usr/include/SDL/*
-
-clean: program-clean
-       rm -f tags
-
-maintainer-clean: program-clean data-clean
-
-program-clean:
-       rm -f *.o vor
-
-data-clean:
-       rm -f $(graphics) font_guts font_guts.pov
-
-mkinstalldirs:
-       if [ ! -d $(DESTDIR)$(pkgdatadir) ]; then mkdir -p $(DESTDIR)$(pkgdatadir); fi
-       if [ ! -d $(DESTDIR)$(bindir) ]; then mkdir -p $(DESTDIR)$(bindir); fi
-
-rminstalldirs: uninstall-data
-       if [ -d $(DESTDIR)$(pkgdatadir) ]; then rmdir $(DESTDIR)$(pkgdatadir); fi
-
-install: all mkinstalldirs install-program install-data
-
-install-program: program
-       $(INSTALL_PROGRAM) ./vor $(DESTDIR)$(bindir)/
-
-install-data: data mkinstalldirs
-       $(INSTALL_DATA) ./data/*.png $(DESTDIR)$(pkgdatadir)/
-       $(INSTALL_DATA) ./data/*.wav $(DESTDIR)$(pkgdatadir)/
-       $(INSTALL_DATA) ./data/*.xm $(DESTDIR)$(pkgdatadir)/
-       @echo
-       @echo "$(pkgdatadir)/icon.png (48x48) or ship.png (32x32) make good icons."
-       @echo
-
-uninstall: uninstall-program uninstall-data rminstalldirs
-
-uninstall-program:
-       rm -f $(DESTDIR)$(bindir)/vor
-
-uninstall-data:
-       rm -f $(DESTDIR)$(pkgdatadir)/*.png
-       rm -f $(DESTDIR)$(pkgdatadir)/*.wav
-       rm -f $(DESTDIR)$(pkgdatadir)/*.xm

diff --git a/Makefile.in b/Makefile.in
new file mode 100644 (file)
index 0000000..15dce6d
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,138 @@
+#   Variations on Rockdodger
+#   Copyright (C) 2004  Joshua Grams <josh@qualdan.com>
+
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+prefix = /usr/local
+exec_prefix = $(prefix)
+
+datarootdir = $(prefix)/share
+pkgdatadir = $(datarootdir)/vor
+bindir = $(exec_prefix)/bin
+
+CFLAGS := -Wall -O3
+LDFLAGS := 
+
+paths := -DDATA_PREFIX=\"$(pkgdatadir)\"
+sdl-cflags := $(shell sdl-config --cflags)
+sdl-ldflags := $(shell sdl-config --libs)
+
+ldflags := $(sdl-ldflags) -lSDL_image -lSDL_mixer $(LDFLAGS)
+cflags := $(sdl-cflags) $(paths) $(CFLAGS)
+
+my_objects := args.o dust.o file.o mt.o rocks.o score.o sprite.o sound.o autopilot.o
+my_objects += main.o
+libs := font.o
+objects := $(libs) $(my_objects)
+
+rocks := 00 01 02 03 04 05 06 07 08 09
+rocks += 10 11 12 13 14 15 16 17 18 19
+rocks += 20 21 22 23 24 25 26 27 28 29
+rocks += 30 31 32 33 34 35 36 37 38 39
+rocks += 40 41 42 43 44 45 46 47 48 49
+rocks := $(rocks:%=data/rock%.png)
+graphics := data/ship.png data/icon.png data/life.png data/font.png $(rocks)
+
+INSTALL := install
+INSTALL_PROGRAM := $(INSTALL)
+INSTALL_DATA := $(INSTALL) -m 644
+
+
+.PHONY: all clean maintainer-clean install uninstall
+.PHONY: mkinstalldirs rminstalldirs
+.PHONY: program program-clean install-program uninstall-program
+.PHONY: data data-clean install-data uninstall-data
+
+.INTERMEDIATE: font_guts font_guts.pov
+
+all: program data
+
+data: $(graphics)
+
+program: vor
+
+%.o: %.c
+       $(CC) $(cflags) -c -o $@ $<
+
+$(my_objects): vorconfig.h
+
+font.o: font.h
+
+args.o: args.h
+
+dust.o: globals.h dust.h float.h mt.h
+
+file.o: file.h common.h
+
+main.o: args.h common.h dust.h file.h float.h globals.h mt.h rocks.h score.h sprite.h sound.h autopilot.h
+
+mt.o: mt.h
+
+rocks.o: rocks.h common.h file.h globals.h mt.h sprite.h
+
+score.o: score.h common.h file.h
+
+sound.o: sound.h args.h common.h
+
+sprite.o: sprite.h common.h
+
+vor: $(objects)
+       $(CC) $^ $(ldflags) -o $@
+
+include gfx.mk
+
+tags: *.c *.h
+       exuberant-ctags *.c *.h /usr/include/SDL/*
+
+clean: program-clean
+       rm -f tags
+
+maintainer-clean: program-clean data-clean
+
+program-clean:
+       rm -f *.o vor
+
+data-clean:
+       rm -f $(graphics) font_guts font_guts.pov
+
+mkinstalldirs:
+       if [ ! -d $(DESTDIR)$(pkgdatadir) ]; then mkdir -p $(DESTDIR)$(pkgdatadir); fi
+       if [ ! -d $(DESTDIR)$(bindir) ]; then mkdir -p $(DESTDIR)$(bindir); fi
+
+rminstalldirs: uninstall-data
+       if [ -d $(DESTDIR)$(pkgdatadir) ]; then rmdir $(DESTDIR)$(pkgdatadir); fi
+
+install: all mkinstalldirs install-program install-data
+
+install-program: program
+       $(INSTALL_PROGRAM) ./vor $(DESTDIR)$(bindir)/
+
+install-data: data mkinstalldirs
+       $(INSTALL_DATA) ./data/*.png $(DESTDIR)$(pkgdatadir)/
+       $(INSTALL_DATA) ./data/*.wav $(DESTDIR)$(pkgdatadir)/
+       $(INSTALL_DATA) ./data/*.xm $(DESTDIR)$(pkgdatadir)/
+       @echo
+       @echo "$(pkgdatadir)/icon.png (48x48) or ship.png (32x32) make good icons."
+       @echo
+
+uninstall: uninstall-program uninstall-data rminstalldirs
+
+uninstall-program:
+       rm -f $(DESTDIR)$(bindir)/vor
+
+uninstall-data:
+       rm -f $(DESTDIR)$(pkgdatadir)/*.png
+       rm -f $(DESTDIR)$(pkgdatadir)/*.wav
+       rm -f $(DESTDIR)$(pkgdatadir)/*.xm

diff --git a/Makefile.win b/Makefile.win
index 29fe5e7..928bca5 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -40,7 +40,7 @@ all: vor
 %.o: %.c
        $(CC) $(CFLAGS) -c -o $@ $<
 
-$(my_objects): config.h
+$(my_objects): vorconfig.h
 
 font.o: font.h
 

diff --git a/Makefile.win_cross b/Makefile.win_cross
index 047c6ee..53b4306 100644 (file)
--- a/Makefile.win_cross
+++ b/Makefile.win_cross
@@ -66,7 +66,7 @@ program: vor.exe
        @echo compiling $@ from $<
        @$(CC) $(cflags) -c -o $@ $<
 
-$(my_objects): config.h
+$(my_objects): vorconfig.h
 
 font.o: font.h
 

diff --git a/args.c b/args.c
index 4d62995..4785bc6 100644 (file)
--- a/args.c
+++ b/args.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "args.h"
-#include "config.h"
+#include "vorconfig.h"
 
 // Look and Feel
 int opt_fullscreen;

diff --git a/config.h b/config.h
deleted file mode 100644 (file)
index 402cbc2..0000000
--- a/config.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef VOR_CONFIG_H
-#define VOR_CONFIG_H
-
-#define VERSION "0.5.4"
-
-// screen size
-#define XSIZE 640
-#define YSIZE 480
-
-#define XSCROLLTO (XSIZE/3)
-#define YSCROLLTO (YSIZE/2)
-
-#define BARRIER_SPEED 7.5
-
-#define MAX_DIST_AHEAD XSIZE
-#define BOUNCINESS 0.50
-
-
-// -----------------------------------------------------------------------
-// Rocks
-
-// number of rock images
-#define NROCKS 50 
-
-// initial/final counts for rocks-on-screen
-#define NORMAL_I_ROCKS 20
-#define NORMAL_F_ROCKS 35  // after 2 minutes
-#define NORMAL_GAMESPEED 1.0
-
-#define EASY_I_ROCKS 10
-#define EASY_F_ROCKS 25  // after 2 minutes
-#define EASY_GAMESPEED 0.85
-
-// number of rock structs to allocate
-#define MAXROCKS 120
-
-#define THRUSTER_STRENGTH 1.5
-
-// how many engine dots come out of each thruster per tic (1/20th of a seccond)
-#define ENGINE_DOTS_PER_TIC 150
-
-#define MAXENGINEDOTS 10000
-#define MAXBANGDOTS 50000
-#define W 100
-#define M 255
-
-// determines how hard they push the rocks. Set to 0 to disable pushing rocks
-#define DOT_MASS_UNIT 0.07
-
-// radius^2 (pixels) which will be cleared of rocks when you die
-#define BLAST_RADIUS 300
-
-// time (in 1/60ths of a seccond) between when you blow up, and when your next
-// ship appears. Make it at least 20.0 so the explosion has time to push the
-// rocks away.
-#define DEAD_PAUSE_LENGTH 40.0
-
-#define MAX_PATH_LEN 1024
-
-// number of milliseconds the blinky cursor stays visible/invisible
-#define CURSOR_BLINK_TIME 300
-
-#endif // VOR_CONFIG_H

diff --git a/dust.c b/dust.c
index ab58395..0e4daa2 100644 (file)
--- a/dust.c
+++ b/dust.c
@@ -1,7 +1,7 @@
 #include <SDL.h>
 #include <math.h>
 
-#include "config.h"
+#include "vorconfig.h"
 #include "globals.h"
 #include "dust.h"
 #include "float.h"

diff --git a/file.c b/file.c
index 40d11fa..3a77ffd 100644 (file)
--- a/file.c
+++ b/file.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 
 #include "common.h"
-#include "config.h"
+#include "vorconfig.h"
 #include "file.h"
 
 #ifdef WIN32

diff --git a/main.c b/main.c
index a2d2e93..794ff8d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -31,7 +31,7 @@
 
 #include "args.h"
 #include "common.h"
-#include "config.h"
+#include "vorconfig.h"
 #include "dust.h"
 #include "file.h"
 #include "float.h"

diff --git a/rocks.c b/rocks.c
index 7c43427..9983809 100644 (file)
--- a/rocks.c
+++ b/rocks.c
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include "common.h"
-#include "config.h"
+#include "vorconfig.h"
 #include "file.h"
 #include "globals.h"
 #include "mt.h"

diff --git a/score.c b/score.c
index 30d30a5..8648679 100644 (file)
--- a/score.c
+++ b/score.c
@@ -25,7 +25,7 @@
 #include "font.h"
 
 #include "common.h"
-#include "config.h"
+#include "vorconfig.h"
 #include "file.h"
 #include "globals.h"
 #include "score.h"

diff --git a/sound.c b/sound.c
index 70ef8e1..4302865 100644 (file)
--- a/sound.c
+++ b/sound.c
@@ -6,7 +6,7 @@
 
 #include "args.h"
 #include "common.h"
-#include "config.h"
+#include "vorconfig.h"
 #include "sound.h"
 
 

diff --git a/sprite.c b/sprite.c
index 742cbc4..923e967 100644 (file)
--- a/sprite.c
+++ b/sprite.c
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include "config.h"
+#include "vorconfig.h"
 #include "common.h"
 #include "globals.h"
 #include "sprite.h"

diff --git a/vorconfig.h b/vorconfig.h
new file mode 100644 (file)
index 0000000..402cbc2
--- /dev/null
+++ b/vorconfig.h
@@ -0,0 +1,63 @@
+#ifndef VOR_CONFIG_H
+#define VOR_CONFIG_H
+
+#define VERSION "0.5.4"
+
+// screen size
+#define XSIZE 640
+#define YSIZE 480
+
+#define XSCROLLTO (XSIZE/3)
+#define YSCROLLTO (YSIZE/2)
+
+#define BARRIER_SPEED 7.5
+
+#define MAX_DIST_AHEAD XSIZE
+#define BOUNCINESS 0.50
+
+
+// -----------------------------------------------------------------------
+// Rocks
+
+// number of rock images
+#define NROCKS 50 
+
+// initial/final counts for rocks-on-screen
+#define NORMAL_I_ROCKS 20
+#define NORMAL_F_ROCKS 35  // after 2 minutes
+#define NORMAL_GAMESPEED 1.0
+
+#define EASY_I_ROCKS 10
+#define EASY_F_ROCKS 25  // after 2 minutes
+#define EASY_GAMESPEED 0.85
+
+// number of rock structs to allocate
+#define MAXROCKS 120
+
+#define THRUSTER_STRENGTH 1.5
+
+// how many engine dots come out of each thruster per tic (1/20th of a seccond)
+#define ENGINE_DOTS_PER_TIC 150
+
+#define MAXENGINEDOTS 10000
+#define MAXBANGDOTS 50000
+#define W 100
+#define M 255
+
+// determines how hard they push the rocks. Set to 0 to disable pushing rocks
+#define DOT_MASS_UNIT 0.07
+
+// radius^2 (pixels) which will be cleared of rocks when you die
+#define BLAST_RADIUS 300
+
+// time (in 1/60ths of a seccond) between when you blow up, and when your next
+// ship appears. Make it at least 20.0 so the explosion has time to push the
+// rocks away.
+#define DEAD_PAUSE_LENGTH 40.0
+
+#define MAX_PATH_LEN 1024
+
+// number of milliseconds the blinky cursor stays visible/invisible
+#define CURSOR_BLINK_TIME 300
+
+#endif // VOR_CONFIG_H