[Tux4kids-commits] r245 - in tuxtype/trunk: . nsis tuxtype tuxtype/data/themes/malayalam
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Sun Sep 16 12:51:54 UTC 2007
Author: dbruce-guest
Date: 2007-09-16 12:51:54 +0000 (Sun, 16 Sep 2007)
New Revision: 245
Modified:
tuxtype/trunk/AUTHORS
tuxtype/trunk/ChangeLog
tuxtype/trunk/Makefile.am
tuxtype/trunk/nsis/tuxtype.nsi.in
tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.am
tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.in
tuxtype/trunk/tuxtype/playgame.c
tuxtype/trunk/tuxtype/titlescreen.c
Log:
fixed Makefile.am error in Malayalam theme (was leaving out settings.txt to set font)
Modified: tuxtype/trunk/AUTHORS
===================================================================
--- tuxtype/trunk/AUTHORS 2007-09-16 12:33:48 UTC (rev 244)
+++ tuxtype/trunk/AUTHORS 2007-09-16 12:51:54 UTC (rev 245)
@@ -35,6 +35,8 @@
Prince K. Antony <prince.kantony at gmail.com> - (for Indic language support)
Mobin Mohan <mobinmohan at gmail.com> - (for Indic language support)
+
+
Note: ConvertUTF.c/.h are from Unicode, Inc. and are released under a very free (BSD-like) license:
"Unicode, Inc. hereby grants the right to freely use the information
Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog 2007-09-16 12:33:48 UTC (rev 244)
+++ tuxtype/trunk/ChangeLog 2007-09-16 12:51:54 UTC (rev 245)
@@ -63,7 +63,7 @@
26 Aug 2007
[ David Bruce ]
- got rid of autogen.sh - autoreconf is recommended way to
- do the same thing.
+ do the same thing according to autotools folks.
- replaced acinclude.m4 with newer version to get rid of
"underquoted AM_PATH_SDL" message.
- fixed bug causing crash on exit from cascade game do to
Modified: tuxtype/trunk/Makefile.am
===================================================================
--- tuxtype/trunk/Makefile.am 2007-09-16 12:33:48 UTC (rev 244)
+++ tuxtype/trunk/Makefile.am 2007-09-16 12:51:54 UTC (rev 245)
@@ -65,7 +65,7 @@
cp $(top_srcdir)/INSTALL $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/INSTALL.txt ; \
cp $(top_srcdir)/README $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/README.txt ; \
cp $(NSI_DLL_DIR)/*.dll $(top_srcdir)/$(NSI_INSTALL_DIR) ; \
- cp $(SUBDIRS)/tuxtype.exe $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxType2.exe ;
+ cp $(SUBDIRS)/tuxtype.exe $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxType.exe ;
# cp $(NSI_DLL_DIR)/*.ttf $(top_srcdir)/$(NSI_INSTALL_DIR)/data/fonts ;
Modified: tuxtype/trunk/nsis/tuxtype.nsi.in
===================================================================
--- tuxtype/trunk/nsis/tuxtype.nsi.in 2007-09-16 12:33:48 UTC (rev 244)
+++ tuxtype/trunk/nsis/tuxtype.nsi.in 2007-09-16 12:51:54 UTC (rev 245)
@@ -6,9 +6,9 @@
!define PKG_VERSION "@VERSION@"
!define PKG_PREFIX "tuxtype"
-!define APP_PREFIX "TuxType2"
+!define APP_PREFIX "TuxType"
!define APP_EXE "${APP_PREFIX}.exe"
-!define APP_NAME "Tux Typing 2"
+!define APP_NAME "Tux Typing"
OutFile "${PKG_PREFIX}-${PKG_VERSION}-win32-installer.exe"
Name "${APP_NAME}"
Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.am 2007-09-16 12:33:48 UTC (rev 244)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.am 2007-09-16 12:51:54 UTC (rev 245)
@@ -4,19 +4,19 @@
scripts\
words
-EXTRA_DIST = keyboard.lst lang.po phrases.txt
+EXTRA_DIST = keyboard.lst lang.po phrases.txt settings.txt
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam
$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/lang.po
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam
$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/keyboard.lst
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam
$(INSTALL_DATA) $(srcdir)/phrases.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/phrases.txt
+ $(INSTALL_DATA) $(srcdir)/settings.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/settings.txt
uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/keyboard.lst
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/lang.po
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/phrases.txt
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/settings.txt
Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.in 2007-09-16 12:33:48 UTC (rev 244)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.in 2007-09-16 12:51:54 UTC (rev 245)
@@ -166,7 +166,7 @@
scripts\
words
-EXTRA_DIST = keyboard.lst lang.po phrases.txt
+EXTRA_DIST = keyboard.lst lang.po phrases.txt settings.txt
all: all-recursive
.SUFFIXES:
@@ -478,15 +478,15 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam
$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/lang.po
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam
$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/keyboard.lst
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam
$(INSTALL_DATA) $(srcdir)/phrases.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/phrases.txt
+ $(INSTALL_DATA) $(srcdir)/settings.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/settings.txt
uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/keyboard.lst
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/lang.po
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/phrases.txt
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/settings.txt
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: tuxtype/trunk/tuxtype/playgame.c
===================================================================
--- tuxtype/trunk/tuxtype/playgame.c 2007-09-16 12:33:48 UTC (rev 244)
+++ tuxtype/trunk/tuxtype/playgame.c 2007-09-16 12:51:54 UTC (rev 245)
@@ -932,7 +932,11 @@
unsigned char filename[FNLEN];
LOG( "=LoadOthers()\n" );
-
+ DEBUGCODE
+ {
+ fprintf(stderr, "settings.theme_font_name is %s\n",
+ settings.theme_font_name);
+ }
font = LoadFont(settings.theme_font_name, GAME_FONT_SIZE);
curlev = BlackOutline(_("Level"), font, &white);
Modified: tuxtype/trunk/tuxtype/titlescreen.c
===================================================================
--- tuxtype/trunk/tuxtype/titlescreen.c 2007-09-16 12:33:48 UTC (rev 244)
+++ tuxtype/trunk/tuxtype/titlescreen.c 2007-09-16 12:51:54 UTC (rev 245)
@@ -1009,6 +1009,12 @@
sel = LoadSprite("menu/sel", IMG_ALPHA);
reg = LoadSprite("menu/reg", IMG_ALPHA);
Tux = LoadSprite("tux", IMG_ALPHA);
+
+ DEBUGCODE
+ {
+ fprintf(stderr, "titlescreen.c load_media(): settings.theme_font_name is %s\n",
+ settings.theme_font_name);
+ }
font = LoadFont(settings.theme_font_name, MENU_FONT_SIZE);
/* Make sure we were successful: */
More information about the Tux4kids-commits
mailing list