From f2b551a3dabec7202f708b4b1d96c713c6a87cac Mon Sep 17 00:00:00 2001
From: Yves Rizoud <yrizoud@gmail.com>
Date: Thu, 23 Oct 2008 23:10:59 +0000
Subject: [PATCH] Makefile: version.o in right directory now, ziprelease now
 adds -nottf to archive names if TrueType support was disabled. Otherwise, the
 435Kb DLLs are included in the win32 archive. The sample font is archived,
 too.

TODO: texte.c should expose a public function that reports if texte.o was
compiled with TTF off. This way, the stats screen can display the information.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@306 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 Makefile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 579b97f4..158b8237 100644
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,13 @@
 ifeq ($(NOTTF),1)
   TTFCOPT = -DNOTTF=1
   TTFLOPT =
+  TTFLIBS =
+  TTFLABEL = -nottf
 else
   TTFCOPT = 
   TTFLOPT = -L/usr/local/lib -lSDL_ttf
+  TTFLIBS = libfreetype-6.dll SDL_ttf.dll
+  TTFLABEL = 
 endif
 
 
@@ -99,10 +103,10 @@ release : $(BIN) $(CFGBIN)
 
 # A release zip archive
 ziprelease: version $(BIN) $(BINCFG) release
-	tar cvzf src-svn`svnversion`.tgz *.c *.h Makefile Makefile.dep
-	zip grafx2-svn`svnversion`-win32.zip $(BIN) $(CFGBIN) gfx2.dat gfx2.ico doc/gpl-2.0.txt SDL.dll 8pxfont.png SDL_image.dll src-svn`svnversion`.tgz
-	$(DELCOMMAND) src-svn`svnversion`.tgz
-	tar cvzf grafx2-svn`svnversion`-src.tgz *.c *.h Makefile Makefile.dep gfx2.dat gfx2.ico doc/gpl-2.0.txt 8pxfont.png
+	tar cvzf src-svn`svnversion | sed 's/:/-/'`.tgz *.c *.h Makefile Makefile.dep
+	zip grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-win32.zip $(BIN) $(CFGBIN) gfx2.dat gfx2.ico doc/gpl-2.0.txt SDL.dll 8pxfont.png SDL_image.dll $(TTFLIBS) fonts/Tuffy.ttf src-svn`svnversion | sed 's/:/-/'`.tgz
+	$(DELCOMMAND) src-svn`svnversion | sed 's/:/-/'`.tgz
+	tar cvzf grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-src.tgz *.c *.h Makefile Makefile.dep gfx2.dat gfx2.ico doc/gpl-2.0.txt 8pxfont.png fonts/Tuffy.ttf
 
 $(BIN) : $(OBJ)
 	$(CC) $(OBJ) -o $(BIN) $(LOPT)
@@ -114,10 +118,7 @@ $(CFGBIN) : $(CFGOBJ)
 version.c :
 	echo "char SVNRevision[]=\"`svnversion`\";" > version.c
 
-version.o : version.c
-	$(CC) $(COPT) -c $*.c -o $*.o
-	
-version : delversion version.c version.o
+version : delversion version.c $(OBJDIR)/version.o
 
 delversion :
 	$(DELCOMMAND) version.c