From 133379d6a35cfeef5f766fb6ea66e9ee942d6d0b Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <limb@jcomserv.net>
Date: Thu, 18 Mar 2010 14:01:04 -0500
Subject: [PATCH] Made my flags overridable, bumped to 1.04.

---
 Makefile  | 27 ++++++++++++++-------------
 Makefile~ | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 main.cpp  |  2 +-
 3 files changed, 65 insertions(+), 14 deletions(-)
 create mode 100644 Makefile~

diff --git a/Makefile b/Makefile
index 36e2e83..0b6d0c3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+CFLAGS = -g
 CXX = g++ $(CFLAGS)
 INST = /usr/local/bin
 
@@ -5,31 +6,31 @@ INST = /usr/local/bin
 main: main.o check_collision.o age_bullet.o gravitize.o radar_plot.o object_out.o motion.o init.o draw.o powerup.o play_sound_effect.o mishaps.o enemy_shoot.o
 	$(CXX) -o curblaster main.o check_collision.o age_bullet.o gravitize.o radar_plot.o object_out.o motion.o init.o draw.o powerup.o play_sound_effect.o mishaps.o enemy_shoot.o -lncurses -lSDL -lSDL_mixer
 main.o: main.cpp
-	$(CXX) -g -c main.cpp
+	$(CXX) -c main.cpp
 check_collision.o: check_collision.cpp check_collision.h
-	$(CXX) -g -c check_collision.cpp	
+	$(CXX) -c check_collision.cpp
 age_bullet.o: age_bullet.cpp age_bullet.h
-	$(CXX) -g -c age_bullet.cpp		
+	$(CXX) -c age_bullet.cpp
 gravitize.o: gravitize.cpp gravitize.h
-	$(CXX) -g -c gravitize.cpp
+	$(CXX) -c gravitize.cpp
 radar_plot.o: radar_plot.cpp radar_plot.h
-	$(CXX) -g -c radar_plot.cpp	
+	$(CXX) -c radar_plot.cpp
 object_out.o: object_out.cpp object_out.h
-	$(CXX) -g -c object_out.cpp		
+	$(CXX) -c object_out.cpp
 motion.o: motion.cpp motion.h
-	$(CXX) -g -c motion.cpp		
+	$(CXX) -c motion.cpp
 init.o: init.cpp init.h
-	$(CXX) -g -c init.cpp		
+	$(CXX) -c init.cpp
 draw.o: draw.cpp draw.h
-	$(CXX) -g -c draw.cpp			
+	$(CXX) -c draw.cpp
 powerup.o: powerup.cpp powerup.h
-	$(CXX) -g -c powerup.cpp					
+	$(CXX) -c powerup.cpp
 play_sound_effect.o: play_sound_effect.cpp play_sound_effect.h
-	$(CXX) -g -c play_sound_effect.cpp						
+	$(CXX) -c play_sound_effect.cpp
 mishaps.o: mishaps.cpp mishaps.h
-	$(CXX) -g -c mishaps.cpp						
+	$(CXX) -c mishaps.cpp
 enemy_shoot.o: enemy_shoot.cpp enemy_shoot.h
-	$(CXX) -g -c enemy_shoot.cpp						
+	$(CXX) -c enemy_shoot.cpp
 install:
 	cp curblaster $(INST)
 remove:
diff --git a/Makefile~ b/Makefile~
new file mode 100644
index 0000000..331b934
--- /dev/null
+++ b/Makefile~
@@ -0,0 +1,50 @@
+CXX = g++ $(CFLAGS)
+INST = /usr/local/bin
+
+
+main: main.o check_collision.o age_bullet.o gravitize.o radar_plot.o object_out.o motion.o init.o draw.o powerup.o play_sound_effect.o mishaps.o enemy_shoot.o
+	$(CXX) -o curblaster main.o check_collision.o age_bullet.o gravitize.o radar_plot.o object_out.o motion.o init.o draw.o powerup.o play_sound_effect.o mishaps.o enemy_shoot.o -lncurses -lSDL -lSDL_mixer
+main.o: main.cpp
+	$(CXX) -c main.cpp
+check_collision.o: check_collision.cpp check_collision.h
+	$(CXX) -c check_collision.cpp
+age_bullet.o: age_bullet.cpp age_bullet.h
+	$(CXX) -c age_bullet.cpp
+gravitize.o: gravitize.cpp gravitize.h
+	$(CXX) -c gravitize.cpp
+radar_plot.o: radar_plot.cpp radar_plot.h
+	$(CXX) -c radar_plot.cpp
+object_out.o: object_out.cpp object_out.h
+	$(CXX) -c object_out.cpp
+motion.o: motion.cpp motion.h
+	$(CXX) -c motion.cpp
+init.o: init.cpp init.h
+	$(CXX) -c init.cpp
+draw.o: draw.cpp draw.h
+	$(CXX) -c draw.cpp
+powerup.o: powerup.cpp powerup.h
+	$(CXX) -c powerup.cpp
+play_sound_effect.o: play_sound_effect.cpp play_sound_effect.h
+	$(CXX) -c play_sound_effect.cpp
+mishaps.o: mishaps.cpp mishaps.h
+	$(CXX) -c mishaps.cpp
+enemy_shoot.o: enemy_shoot.cpp enemy_shoot.h
+	$(CXX) -c enemy_shoot.cpp
+install:
+	cp curblaster $(INST)
+remove:
+	rm $(INST)/curblaster
+uninstall: remove
+
+clean:
+	rm *.o
+	rm curblaster
+
+
+
+
+
+
+
+
+
diff --git a/main.cpp b/main.cpp
index b7676fa..b782ccb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -48,7 +48,7 @@ const int landershotmax = 10;
 const int landermax = 12;
 const int crawlermax = 6;
 const int missilemax = 3;
-const float version = 1.03;
+const float version = 1.04;
 
 int score;
 int lives;
-- 
2.9.0