X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=Makefile.win;h=928bca5ce075c411f6b6b6b393d396d13fc84936;hp=92af68bcdfb01abea4c97635785ab1ea66e3e544;hb=HEAD;hpb=7981a2b8d152e6372aea8191f8c2197f866a450b

diff --git a/Makefile.win b/Makefile.win
index 92af68b..928bca5 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -15,12 +15,13 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+CC := gcc
 LDFLAGS := -mwindows -lmingw32 -lSDLmain -lSDL -lSDL_image -lSDL_mixer
-CFLAGS := -Wall -O3
+CFLAGS := -Wall -O3 -ISDL
 
 my_objects := args.o dust.o file.o mt.o rocks.o score.o sprite.o sound.o
 my_objects += main.o
-libs := SFont.o
+libs := font.o
 objects := $(libs) $(my_objects)
 
 rocks := 00 01 02 03 04 05 06 07 08 09
@@ -29,7 +30,7 @@ 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\life.png $(rocks)
+graphics := data\ship.png data\life.png data\font.png $(rocks)
 
 
 .PHONY: all clean
@@ -39,9 +40,9 @@ all: vor
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(my_objects): config.h
+$(my_objects): vorconfig.h
 
-SFont.o: SFont.h
+font.o: font.h
 
 args.o: args.h
 
@@ -62,7 +63,8 @@ sound.o: sound.h args.h common.h
 sprite.o: sprite.h common.h
 
 vor: $(objects)
-	$(CC) $(LDFLAGS) -o $@ $^
+	$(CC) $^ $(LDFLAGS) -o $@
 
 clean: 
-	del vor *.o
+	del vor
+	del *.o