From c353cf67a62c9b35cd7c2844b80cc68c8c961af1 Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Mon, 24 May 2010 22:25:08 +0000 Subject: [PATCH] Fixed makefile and added missing doc git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1489 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- doc/PF_fonts.txt | 21 +++++++++++++++++++++ src/Makefile | 6 +++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/doc/PF_fonts.txt b/doc/PF_fonts.txt index e69de29b..ba57a81b 100644 --- a/doc/PF_fonts.txt +++ b/doc/PF_fonts.txt @@ -0,0 +1,21 @@ +Fonts by Yusuke Kamiyamane +http://p.yusukekamiyamane.com/fonts/ + +License: "The fonts can be used free for any personal or commercial projects." + +- Arma Five +- Ronda Seven +- Easta Seven +- Westa Seven +- Tempesta Seven +- Tempesta Five + + + +Converted to Sfont format by yrizoud +Changed filenames for better sorting: + for Compressed +_ for Condensed +__ for Normal +___ for Extended + diff --git a/src/Makefile b/src/Makefile index 8fb490c4..fd76d501 100644 --- a/src/Makefile +++ b/src/Makefile @@ -311,7 +311,7 @@ SCRIPT_FILES1 = ../share/grafx2/scripts/bru_db_Amigaball.lua ../share/grafx2/scr SCRIPT_FILES2 = ../share/grafx2/scripts/pic_db_SierpinskyTriangle.lua ../share/grafx2/scripts/pic_ni_Colorspace12bit.lua ../share/grafx2/scripts/pic_ni_Colorspace15bit.lua ../share/grafx2/scripts/pic_ni_Colorspace18bit.lua ../share/grafx2/scripts/pic_ni_GlassGridFilter.lua ../share/grafx2/scripts/pic_ni_Grid8.lua ../share/grafx2/scripts/pic_ni_Grid8red.lua ../share/grafx2/scripts/pic_ni_GridIso.lua ../share/grafx2/scripts/pic_ni_PaletteX1.lua ../share/grafx2/scripts/pic_ni_PaletteX8.lua ../share/grafx2/scripts/scn_db_RemapImage2RGB.lua ../share/grafx2/scripts/scn_db_RemapImage2RGB_ed.lua ../share/grafx2/scripts/scn_db_RemapImageTo3bitPal.lua SCRIPT_FILES1= SCRIPT_FILES1 SCRIPT_FILES2 -FONT_FILES = ../share/grafx2/fonts/8pxfont.png ../share/grafx2/fonts/Tuffy.ttf../share/grafx2/fonts/PF_Arma_5__.png ../share/grafx2/grafx2/fonts/PF_Easta_7_.png ../share/grafx2/grafx2/fonts/PF_Easta_7__.png ../share/grafx2/grafx2/fonts/PF_Ronda_7__.png ../share/grafx2/grafx2/fonts/PF_Tempesta_5.png ../share/grafx2/grafx2/fonts/PF_Tempesta_5_.png ../share/grafx2/grafx2/fonts/PF_Tempesta_5__.png ../share/grafx2/grafx2/fonts/PF_Tempesta_5___.png ../share/grafx2/grafx2/fonts/PF_Tempesta_7.png ../share/grafx2/grafx2/fonts/PF_Tempesta_7_.png ../share/grafx2/grafx2/fonts/PF_Tempesta_7__.png ../share/grafx2/grafx2/fonts/PF_Tempesta_7___.png ../share/grafx2/grafx2/fonts/PF_Westa_7_.png ../share/grafx2/grafx2/fonts/PF_Westa_7__.png +FONT_FILES = ../share/grafx2/fonts/8pxfont.png ../share/grafx2/fonts/Tuffy.ttf ../share/grafx2/fonts/PF_Arma_5__.png ../share/grafx2/fonts/PF_Easta_7_.png ../share/grafx2/fonts/PF_Easta_7__.png ../share/grafx2/fonts/PF_Ronda_7__.png ../share/grafx2/fonts/PF_Tempesta_5.png ../share/grafx2/fonts/PF_Tempesta_5_.png ../share/grafx2/fonts/PF_Tempesta_5__.png ../share/grafx2/fonts/PF_Tempesta_5___.png ../share/grafx2/fonts/PF_Tempesta_7.png ../share/grafx2/fonts/PF_Tempesta_7_.png ../share/grafx2/fonts/PF_Tempesta_7__.png ../share/grafx2/fonts/PF_Tempesta_7___.png ../share/grafx2/fonts/PF_Westa_7_.png ../share/grafx2/fonts/PF_Westa_7__.png ifeq ($(PLATFORM),Darwin) @@ -345,9 +345,9 @@ ziprelease: version $(BIN) release echo `sed "s/.*=\"\(.*\)\";/\1/" pversion.c`.`svnversion` | tr " :" "_-" | sed -e "s/\(wip\)\\./\1/I" > $(OBJDIR)/versiontag tar cvzf "../src-`cat $(OBJDIR)/versiontag`.tgz" --strip=1 ../src/*.c ../src/*.h ../src/Makefile ../src/Makefile.dep ../src/gfx2.ico - cd .. && $(ZIP) $(ZIPOPT) "grafx2-`cat $(OBJDIR:../%=%)/versiontag`$(TTFLABEL)-$(PLATFORM).$(ZIP)" $(BIN:../%=%) share/grafx2/gfx2def.ini $(SCRIPT_FILES:../%=%) $(SKIN_FILES:../%=%) share/grafx2/gfx2.gif share/icons/grafx2.svg doc/README.txt doc/COMPILING.txt doc/gpl-2.0.txt $(FONT_FILES:../%=%) doc/README-zlib1.txt doc/README-SDL.txt doc/README-SDL_image.txt doc/README-SDL_ttf.txt doc/README-lua.txt src-`cat $(OBJDIR:../%=%)/versiontag`.tgz $(PLATFORMFILES:../%=%) + cd .. && $(ZIP) $(ZIPOPT) "grafx2-`cat $(OBJDIR:../%=%)/versiontag`$(TTFLABEL)-$(PLATFORM).$(ZIP)" $(BIN:../%=%) share/grafx2/gfx2def.ini $(SCRIPT_FILES:../%=%) $(SKIN_FILES:../%=%) share/grafx2/gfx2.gif share/icons/grafx2.svg doc/README.txt doc/COMPILING.txt doc/gpl-2.0.txt doc/PF_fonts.txt $(FONT_FILES:../%=%) doc/README-zlib1.txt doc/README-SDL.txt doc/README-SDL_image.txt doc/README-SDL_ttf.txt doc/README-lua.txt src-`cat $(OBJDIR:../%=%)/versiontag`.tgz $(PLATFORMFILES:../%=%) $(DELCOMMAND) "../src-`cat $(OBJDIR)/versiontag`.tgz" - tar cvzf "../grafx2-`cat $(OBJDIR)/versiontag`$(TTFLABEL)-src.tgz" --strip=1 --transform 's,^,grafx2/,g' ../src/*.c ../src/*.h ../src/Makefile ../src/Makefile.dep ../share/grafx2/gfx2def.ini $(SCRIPT_FILES) $(SKIN_FILES) ../src/gfx2.ico ../share/grafx2/gfx2.gif ../share/icons/grafx2.svg ../doc/README.txt ../doc/COMPILING.txt ../doc/gpl-2.0.txt ../misc/unix/grafx2.1 ../misc/unix/grafx2.xpm ../misc/unix/grafx2.desktop $(FONT_FILES) + tar cvzf "../grafx2-`cat $(OBJDIR)/versiontag`$(TTFLABEL)-src.tgz" --strip=1 --transform 's,^,grafx2/,g' ../src/*.c ../src/*.h ../src/Makefile ../src/Makefile.dep ../share/grafx2/gfx2def.ini $(SCRIPT_FILES) $(SKIN_FILES) ../src/gfx2.ico ../share/grafx2/gfx2.gif ../share/icons/grafx2.svg ../doc/README.txt ../doc/COMPILING.txt ../doc/gpl-2.0.txt ../doc/PF_fonts.txt ../misc/unix/grafx2.1 ../misc/unix/grafx2.xpm ../misc/unix/grafx2.desktop $(FONT_FILES) $(DELCOMMAND) "$(OBJDIR)/versiontag" testsed :