|
From: <fa...@us...> - 2008-06-15 12:22:01
|
Revision: 18860
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18860&view=rev
Author: fabbo
Date: 2008-06-15 05:22:02 -0700 (Sun, 15 Jun 2008)
Log Message:
-----------
Windows adjustments, merge something from main
Modified Paths:
--------------
branches/fabrizio/v1.22.13-newjoydesign/vice/ChangeLog
branches/fabrizio/v1.22.13-newjoydesign/vice/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/aclocal.m4
branches/fabrizio/v1.22.13-newjoydesign/vice/build/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/configure
branches/fabrizio/v1.22.13-newjoydesign/vice/configure.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/C128/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/C64/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/CBM-II/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/DRIVES/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/PET/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/PLUS4/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/PRINTER/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/VIC20/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/Makefile.am
branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/doc/Makefile.am
branches/fabrizio/v1.22.13-newjoydesign/vice/doc/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/Makefile.am
branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/man/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/po/de.po
branches/fabrizio/v1.22.13-newjoydesign/vice/po/fr.po
branches/fabrizio/v1.22.13-newjoydesign/vice/po/hu.po
branches/fabrizio/v1.22.13-newjoydesign/vice/po/it.po
branches/fabrizio/v1.22.13-newjoydesign/vice/po/nl.po
branches/fabrizio/v1.22.13-newjoydesign/vice/po/pl.po
branches/fabrizio/v1.22.13-newjoydesign/vice/po/sv.po
branches/fabrizio/v1.22.13-newjoydesign/vice/src/ChangeLog
branches/fabrizio/v1.22.13-newjoydesign/vice/src/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/uiapi.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/kbd/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/snippets/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/vac++/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/vac++/config.h
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/watcom/config.h
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/riscos/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/menu/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/view/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/readline/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/gnome/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/gnome/uifileentry.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/ui-resources.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/xaw/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/xaw/widgets/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/xaw/x11video.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/Makefile.am
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/signals.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui-resources.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uikeyboard.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uikeyboard.h
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/utils/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/vsyncarch.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/watcom/config.h
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/watcom/maincpu.tgt
branches/fabrizio/v1.22.13-newjoydesign/vice/src/c128/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/cart/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/cbm2/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/config.h.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/core/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/crtc/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/diskimage/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iec/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iec/c64exp/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iec/plus4exp/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iec128dcr/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iecieee/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/ieee/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/tcbm/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/fileio/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/fsdevice/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/gfxoutputdrv/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/iecbus/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/imagecontents/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/ioutil.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/Makefile
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystickdrv/joy_winmm.c
branches/fabrizio/v1.22.13-newjoydesign/vice/src/lib/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/lib/lpng/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/lib/zlib/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/Makefile.am
branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/parallel/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/pet/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/plus4/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/printerdrv/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/raster/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/resid/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/rs232drv/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/serial/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/sid/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/sounddrv/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/tape/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/vdc/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/vdrive/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/version.h
branches/fabrizio/v1.22.13-newjoydesign/vice/src/vic20/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/vicii/Makefile.in
branches/fabrizio/v1.22.13-newjoydesign/vice/src/video/Makefile.in
Added Paths:
-----------
branches/fabrizio/v1.22.13-newjoydesign/vice/autogen.sh
branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/vice-cbm.bdf
Removed Paths:
-------------
branches/fabrizio/v1.22.13-newjoydesign/vice/depcomp
branches/fabrizio/v1.22.13-newjoydesign/vice/doc/texinfo.tex
branches/fabrizio/v1.22.13-newjoydesign/vice/missing
branches/fabrizio/v1.22.13-newjoydesign/vice/po/cat-id-tbl.c
branches/fabrizio/v1.22.13-newjoydesign/vice/po/de.gmo
branches/fabrizio/v1.22.13-newjoydesign/vice/po/fr.gmo
branches/fabrizio/v1.22.13-newjoydesign/vice/po/hu.gmo
branches/fabrizio/v1.22.13-newjoydesign/vice/po/it.gmo
branches/fabrizio/v1.22.13-newjoydesign/vice/po/nl.gmo
branches/fabrizio/v1.22.13-newjoydesign/vice/po/pl.gmo
branches/fabrizio/v1.22.13-newjoydesign/vice/po/stamp-cat-id
branches/fabrizio/v1.22.13-newjoydesign/vice/po/sv.gmo
branches/fabrizio/v1.22.13-newjoydesign/vice/po/vice.pot
branches/fabrizio/v1.22.13-newjoydesign/vice/src/resid/aclocal.m4
branches/fabrizio/v1.22.13-newjoydesign/vice/src/resid/config.guess
branches/fabrizio/v1.22.13-newjoydesign/vice/src/resid/config.sub
branches/fabrizio/v1.22.13-newjoydesign/vice/src/resid/configure
branches/fabrizio/v1.22.13-newjoydesign/vice/src/resid/depcomp
branches/fabrizio/v1.22.13-newjoydesign/vice/src/resid/install-sh
branches/fabrizio/v1.22.13-newjoydesign/vice/src/resid/missing
branches/fabrizio/v1.22.13-newjoydesign/vice/src/resid/mkinstalldirs
Property Changed:
----------------
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/keyedobjects.nib
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/keyedobjects.nib
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/VICEInformation.nib/keyedobjects.nib
branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/keyedobjects.nib
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/ChangeLog
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/ChangeLog 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/ChangeLog 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,3 +1,43 @@
+2008-05-19 Spiro Trikaliotis <spi...@gm...>
+
+ * autogen.sh: Removed "bash-ism" from script (compare with "=="
+ instead of "=").
+
+2008-05-19 Spiro Trikaliotis <spi...@gm...>
+
+ * depcomp, missing, aclocal.m4, po/stamp-cat-id, po/vice.pot,
+ po/fr.gmo, po/nl.gmo, po/pl.gmo, po/hu.gmo, po/it.gmo,
+ po/de.gmo, po/sv.gmo: Removed some more auto-generated or
+ unnecessary files.
+
+2008-05-18 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.15.
+
+2008-05-16 Marco van den Heuvel <bla...@ya...>
+
+ * doc/html/Makefile.am, doc/Makefile.am: Changed the way the
+ docdir is dealt with, old way made some autotools versions end
+ up with an error.
+
+2008-05-13 Spiro Trikaliotis <spi...@gm...>
+
+ * autogen.sh: generates (almost) all files which can be
+ auto-generated. Exceptions: Files which are needed for platforms
+ which cannot built them themselves, or which are deliberately
+ changed from the auto-generated forms. These files are:
+ config.guess, config.sub (deliberately changed), and
+ src/monitor/mon_parse.c, src/monitor/mon_parse.h,
+ src/monitor/mon_lex.c (their absense would break compilation for
+ some platforms).
+
+ * src/config.h.in, doc/texinfo.tex, po/cat-id-tbl.c,
+ */Makefile.in: removed files which can be auto-generated.
+
+2008-05-07 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.14.
+
2008-04-27 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.13.
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/Makefile.in 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/Makefile.in 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -108,6 +108,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FCCACHE = @FCCACHE@
FFMPEG_INCLUDES = @FFMPEG_INCLUDES@
FFMPEG_LIBS = @FFMPEG_LIBS@
FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@
@@ -393,8 +394,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -419,8 +420,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -430,13 +431,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -507,6 +507,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -533,6 +537,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -682,7 +688,7 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+ dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/aclocal.m4
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/aclocal.m4 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/aclocal.m4 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,12 +11,15 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -31,7 +34,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -47,8 +50,10 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -320,7 +325,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -380,13 +385,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -491,16 +496,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -793,7 +799,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
Copied: branches/fabrizio/v1.22.13-newjoydesign/vice/autogen.sh (from rev 18794, trunk/vice/autogen.sh)
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/autogen.sh (rev 0)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/autogen.sh 2008-06-15 12:22:02 UTC (rev 18860)
@@ -0,0 +1,104 @@
+#! /bin/sh
+
+#
+# autogen.sh - generate the auto* files of VICE
+#
+# Written by
+# Spiro Trikaliotis <spi...@gm...>
+#
+# This file is part of VICE, the Versatile Commodore Emulator.
+# See README for copyright notice.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+#
+
+do_command() {
+ # $1 - command
+ # $2 - options
+
+ echo `pwd`: $1 $2
+ $1 $2 > .$1.out 2>&1
+ ret=$?
+ if [ ! $ret = 0 ] ; then
+ echo "ERROR: $1 failed in `pwd`"
+ exit 1
+ fi
+}
+
+do_aclocal() {
+ do_command aclocal
+}
+
+do_autoconf() {
+ do_command autoconf -f
+}
+
+do_autoheader() {
+ if [ ! x"`sed -ne "s/.*AM_CONFIG_HEADER\((.*)\).*/\1/p" configure.in`" = x ]; then
+ do_command autoheader
+ fi
+}
+
+do_automake() {
+ do_command automake "-a -c" # " -f"
+}
+
+buildfiles() {
+ FILES_TO_REMEMBER="INSTALL"
+
+ # Save some files which should not be overwritten
+
+ for A in $FILES_TO_REMEMBER; do
+ [ -e $A ] && mv $A $A.backup
+ done
+
+ do_aclocal
+
+ do_autoconf
+ do_autoheader
+ do_automake
+
+ # Restore the files which should not be overwritten
+
+ for A in $FILES_TO_REMEMBER; do
+ [ -e $A ] && mv $A.backup $A
+ done
+}
+
+SUBDIRECTORIES=`sed -ne "s/.*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/p" configure.in`
+
+for A in $SUBDIRECTORIES; do
+ (
+ cd $A
+ buildfiles
+ )
+done
+
+buildfiles
+
+if [ x"$1" = x"--dist" ]; then
+
+ ./configure
+ (cd src/monitor/; make mon_lex.c mon_parse.c)
+
+ (cd po; make cat-id-tbl.c)
+
+ SVN_ADD_FILES="configure src/config.h.in config.guess config.sub src/monitor/mon_parse.c src/monitor/mon_parse.h src/monitor/mon_lex.c src/resid/depcomp src/resid/mkinstalldirs src/resid/missing src/resid/install-sh doc/texinfo.tex po/cat-id-tbl.c"
+ SVN_ADD_MAKEFILES="`find . -name Makefile.in`"
+
+ svn add $SVN_ADD_FILES $SVN_ADD_MAKEFILES
+
+fi
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/build/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/build/Makefile.in 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/build/Makefile.in 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -79,6 +79,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FCCACHE = @FCCACHE@
FFMPEG_INCLUDES = @FFMPEG_INCLUDES@
FFMPEG_LIBS = @FFMPEG_LIBS@
FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/configure
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/configure 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/configure 2008-06-15 12:22:02 UTC (rev 18860)
@@ -778,6 +778,9 @@
FFMPEG_LIBS
DOS_TFE_PCAP_LIB
TFE_LIBS
+FCCACHE
+HAVE_FC_CACHE_TRUE
+HAVE_FC_CACHE_FALSE
WINDRES
WRC
SOUND_DRIVERS
@@ -1962,7 +1965,7 @@
VICE_VERSION_MAJOR=1
VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=13
+VICE_VERSION_BUILD=15
@@ -5179,9 +5182,10 @@
JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS joy_directinput.o"
cat >>confdefs.h <<\_ACEOF
-#define USE_DIRECTINPUT
+#define HAVE_DINPUT
_ACEOF
+ LIBS="-ldinput $LIBS"
fi
@@ -18375,6 +18379,72 @@
fi
+for ac_prog in fc-cache
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_FCCACHE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $FCCACHE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_FCCACHE="$FCCACHE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_FCCACHE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+FCCACHE=$ac_cv_path_FCCACHE
+if test -n "$FCCACHE"; then
+ { echo "$as_me:$LINENO: result: $FCCACHE" >&5
+echo "${ECHO_T}$FCCACHE" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$FCCACHE" && break
+done
+test -n "$FCCACHE" || FCCACHE="false"
+
+if test x"$FCCACHE" = "xfalse"; then
+ if false; then
+ HAVE_FC_CACHE_TRUE=
+ HAVE_FC_CACHE_FALSE='#'
+else
+ HAVE_FC_CACHE_TRUE='#'
+ HAVE_FC_CACHE_FALSE=
+fi
+
+else
+ if true; then
+ HAVE_FC_CACHE_TRUE=
+ HAVE_FC_CACHE_FALSE='#'
+else
+ HAVE_FC_CACHE_TRUE='#'
+ HAVE_FC_CACHE_FALSE=
+fi
+
+fi
+
if test x"$is_amigaos4" = "xyes"; then
{ echo "$as_me:$LINENO: checking whether devices/timer.h defines TimeVal" >&5
echo $ECHO_N "checking whether devices/timer.h defines TimeVal... $ECHO_C" >&6; }
@@ -26145,7 +26215,7 @@
elif test x"$is_win32" = "xyes"; then
- LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lwinmm -lcomdlg32 -lcomctl32 -lddraw -ldsound -ldinput -lth32 -lwsock32 -lversion"
+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lwinmm -lcomdlg32 -lcomctl32 -lddraw -ldsound -lth32 -lwsock32 -lversion"
{ echo "$as_me:$LINENO: checking for GUID_SysMouse in -ldxguid" >&5
echo $ECHO_N "checking for GUID_SysMouse in -ldxguid... $ECHO_C" >&6; }
@@ -28361,6 +28431,20 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${HAVE_FC_CACHE_TRUE}" && test -z "${HAVE_FC_CACHE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_FC_CACHE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_FC_CACHE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_FC_CACHE_TRUE}" && test -z "${HAVE_FC_CACHE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_FC_CACHE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_FC_CACHE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${NEED_READLINE_TRUE}" && test -z "${NEED_READLINE_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"NEED_READLINE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -30263,6 +30347,9 @@
FFMPEG_LIBS!$FFMPEG_LIBS$ac_delim
DOS_TFE_PCAP_LIB!$DOS_TFE_PCAP_LIB$ac_delim
TFE_LIBS!$TFE_LIBS$ac_delim
+FCCACHE!$FCCACHE$ac_delim
+HAVE_FC_CACHE_TRUE!$HAVE_FC_CACHE_TRUE$ac_delim
+HAVE_FC_CACHE_FALSE!$HAVE_FC_CACHE_FALSE$ac_delim
WINDRES!$WINDRES$ac_delim
WRC!$WRC$ac_delim
SOUND_DRIVERS!$SOUND_DRIVERS$ac_delim
@@ -30289,9 +30376,6 @@
GTKGL_CFLAGS!$GTKGL_CFLAGS$ac_delim
GTKGL_LIBS!$GTKGL_LIBS$ac_delim
VICE_SYNC!$VICE_SYNC$ac_delim
-FULLSCREEN_DRIVERS!$FULLSCREEN_DRIVERS$ac_delim
-JOYSTICK_DRIVERS!$JOYSTICK_DRIVERS$ac_delim
-HAVE_REALDEVICE_TRUE!$HAVE_REALDEVICE_TRUE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -30333,6 +30417,9 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+FULLSCREEN_DRIVERS!$FULLSCREEN_DRIVERS$ac_delim
+JOYSTICK_DRIVERS!$JOYSTICK_DRIVERS$ac_delim
+HAVE_REALDEVICE_TRUE!$HAVE_REALDEVICE_TRUE$ac_delim
HAVE_REALDEVICE_FALSE!$HAVE_REALDEVICE_FALSE$ac_delim
x64_LDFLAGS!$x64_LDFLAGS$ac_delim
x128_LDFLAGS!$x128_LDFLAGS$ac_delim
@@ -30405,7 +30492,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -30806,21 +30893,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $ac_file | $ac_file:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -30857,7 +30945,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/configure.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/configure.in 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/configure.in 2008-06-15 12:22:02 UTC (rev 18860)
@@ -9,7 +9,7 @@
VICE_VERSION_MAJOR=1
VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=13
+VICE_VERSION_BUILD=15
AC_SUBST(VICE_VERSION_MAJOR)
AC_SUBST(VICE_VERSION_MINOR)
@@ -273,7 +273,8 @@
AC_DEFINE(USE_WINMM_JOY,,[Use Windows Multimedia joystick driver])
AC_CHECK_HEADER(dinput.h,
[ JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS joy_directinput.o" ]
- AC_DEFINE(USE_DIRECTINPUT,,[Use DirectInput joystick driver])
+ [ AC_DEFINE(HAVE_DINPUT,,[Use DirectInput joystick driver]) ]
+ [ LIBS="-ldinput $LIBS" ]
,)
elif test x"$host_os" = "xbeos"; then
@@ -1233,6 +1234,13 @@
AC_DEFINE(USE_LAMEMP3,,[Enable lamemp3 support.])],,$SOUND_LIBS -lmpgdecoder)
fi
+AC_PATH_PROGS(FCCACHE, fc-cache, false)
+if test x"$FCCACHE" = "xfalse"; then
+ AM_CONDITIONAL(HAVE_FC_CACHE, false)
+else
+ AM_CONDITIONAL(HAVE_FC_CACHE, true)
+fi
+
if test x"$is_amigaos4" = "xyes"; then
AC_MSG_CHECKING(whether devices/timer.h defines TimeVal)
AC_TRY_COMPILE([ #include <devices/timer.h> ],
@@ -1733,7 +1741,7 @@
dnl On Windows, we already know what we want.
- LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lwinmm -lcomdlg32 -lcomctl32 -lddraw -ldsound -ldinput -lth32 -lwsock32 -lversion"
+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lwinmm -lcomdlg32 -lcomctl32 -lddraw -ldsound -lth32 -lwsock32 -lversion"
AC_CHECK_LIB(dxguid, GUID_SysMouse,[LIBS="$LIBS -ldxguid";
AC_DEFINE(HAVE_GUIDLIB,,
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/data/C128/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/data/C128/Makefile.in 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/data/C128/Makefile.in 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -89,6 +89,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FCCACHE = @FCCACHE@
FFMPEG_INCLUDES = @FFMPEG_INCLUDES@
FFMPEG_LIBS = @FFMPEG_LIBS@
FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/data/C64/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/data/C64/Makefile.in 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/data/C64/Makefile.in 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -89,6 +89,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FCCACHE = @FCCACHE@
FFMPEG_INCLUDES = @FFMPEG_INCLUDES@
FFMPEG_LIBS = @FFMPEG_LIBS@
FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/data/CBM-II/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/data/CBM-II/Makefile.in 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/data/CBM-II/Makefile.in 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -89,6 +89,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FCCACHE = @FCCACHE@
FFMPEG_INCLUDES = @FFMPEG_INCLUDES@
FFMPEG_LIBS = @FFMPEG_LIBS@
FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/data/DRIVES/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/data/DRIVES/Makefile.in 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/data/DRIVES/Makefile.in 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -89,6 +89,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FCCACHE = @FCCACHE@
FFMPEG_INCLUDES = @FFMPEG_INCLUDES@
FFMPEG_LIBS = @FFMPEG_LIBS@
FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/data/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/data/Makefile.in 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/data/Makefile.in 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -91,6 +91,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FCCACHE = @FCCACHE@
FFMPEG_INCLUDES = @FFMPEG_INCLUDES@
FFMPEG_LIBS = @FFMPEG_LIBS@
FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@
@@ -373,8 +374,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -399,8 +400,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -410,13 +411,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/data/PET/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/data/PET/Makefile.in 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/data/PET/Makefile.in 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -89,6 +89,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FCCACHE = @FCCACHE@
FFMPEG_INCLUDES = @FFMPEG_INCLUDES@
FFMPEG_LIBS = @FFMPEG_LIBS@
FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/data/PLUS4/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/data/PLUS4/Makefile.in 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/data/PLUS4/Makefile.in 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -89,6 +89,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FCCACHE = @FCCACHE@
FFMPEG_INCLUDES = @FFMPEG_INCLUDES@
FFMPEG_LIBS = @FFMPEG_LIBS@
FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/data/PRINTER/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/data/PRINTER/Makefile.in 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/data/PRINTER/Makefile.in 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -89,6 +89,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FCCACHE = @FCCACHE@
FFMPEG_INCLUDES = @FFMPEG_INCLUDES@
FFMPEG_LIBS = @FFMPEG_LIBS@
FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/data/VIC20/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/data/VIC20/Makefile.in 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/data/VIC20/Makefile.in 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -89,6 +89,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FCCACHE = @FCCACHE@
FFMPEG_INCLUDES = @FFMPEG_INCLUDES@
FFMPEG_LIBS = @FFMPEG_LIBS@
FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/Makefile.am
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/Makefile.am 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/Makefile.am 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,20 +1,26 @@
fontsdir = $(VICEDIR)/fonts
fonts_DATA = \
+ vice-cbm.bdf \
CBM.ttf
EXTRA_DIST = $(fonts_DATA) cbm-directory-charset.fon
install: install-data-am
- @echo "Preparing fontdir, please wait..." ; \
- if [ ! `fc-cache --list > /dev/null 2>&1` ] ; then \
- if test "x${HOME}" != "x" ; then \
- mkdir ${HOME}/.fonts > /dev/null 2>&1 ; \
- cp $(fontsdir)/CBM.ttf ${HOME}/.fonts ; \
- fc-cache ; \
- else \
- echo '$$HOME not set... giving up.' ; \
- fi \
- else \
- echo 'fc-cache not available... giving up.' ; \
- fi
+@HAVE_FC_CACHE_TRUE@ @echo "Preparing fontdir, please wait..." ; \
+@HAVE_FC_CACHE_TRUE@ if [ ! `fc-cache --list > /dev/null 2>&1` ] ; then \
+@HAVE_FC_CACHE_TRUE@ if test "x${HOME}" != "x" ; then \
+@HAVE_FC_CACHE_TRUE@ mkdir ${HOME}/.fonts > /dev/null 2>&1 ; \
+@HAVE_FC_CACHE_TRUE@ cp $(fontsdir)/CBM.ttf ${HOME}/.fonts ; \
+@HAVE_FC_CACHE_TRUE@ fc-cache ; \
+@HAVE_FC_CACHE_TRUE@ else \
+@HAVE_FC_CACHE_TRUE@ echo '$$HOME not set... giving up.' ; \
+@HAVE_FC_CACHE_TRUE@ fi \
+@HAVE_FC_CACHE_TRUE@ else \
+@HAVE_FC_CACHE_TRUE@ echo 'fc-cache not available... giving up.' ; \
+@HAVE_FC_CACHE_TRUE@ fi
+@HAVE_FC_CACHE_FALSE@ @echo "Preparing fontdir..." ; \
+@HAVE_FC_CACHE_FALSE@ cd $(DESTDIR)$(fontsdir) ; \
+@HAVE_FC_CACHE_FALSE@ bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \
+@HAVE_FC_CACHE_FALSE@ rm vice-cbm.bdf ; \
+@HAVE_FC_CACHE_FALSE@ mkfontdir .
Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/Makefile.in
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/Makefile.in 2008-06-15 08:54:26 UTC (rev 18859)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/Makefile.in 2008-06-15 12:22:02 UTC (rev 18860)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -89,6 +89,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FCCACHE = @FCCACHE@
FFMPEG_INCLUDES = @FFMPEG_INCLUDES@
FFMPEG_LIBS = @FFMPEG_LIBS@
FULLSCREEN_DRIVERS = @FULLSCREEN_DRIVERS@
@@ -262,6 +263,7 @@
xvic_LDFLAGS = @xvic_LDFLAGS@
fontsdir = $(VICEDIR)/fonts
fonts_DATA = \
+ vice-cbm.bdf \
CBM.ttf
EXTRA_DIST = $(fonts_DATA) cbm-directory-charset.fon
@@ -446,18 +448,23 @@
install: install-data-am
- @echo "Preparing fontdir, please wait..." ; \
- if [ ! `fc-cache --list > /dev/null 2>&1` ] ; then \
- if test "x${HOME}" != "x" ; then \
- mkdir ${HOME}/.fonts > /dev/null 2>&1 ; \
- cp $(fontsdir)/CBM.ttf ${HOME}/.fonts ; \
- fc-cache ; \
- else \
- echo '$$HOME not set... giving up.' ; \
- fi \
- else \
- echo 'fc-cache not available... giving up.' ; \
- fi
+@HAVE_FC_CACHE_TRUE@ @echo "Preparing fontdir, please wait..." ; \
+@HAVE_FC_CACHE_TRUE@ if [ ! `fc-cache --list > /dev/null 2>&1` ] ; then \
+@HAVE_FC_CACHE_TRUE@ if test "x${HOME}" != "x" ; then \
+@HAVE_FC_CACHE_TRUE@ mkdir ${HOME}/.fonts > /dev/null 2>&1 ; \
+@HAVE_FC_CACHE_TRUE@ cp $(fontsdir)/CBM.ttf ${HOME}/.fonts ; \
+@HAVE_FC_CACHE_TRUE@ fc-cache ; \
+@HAVE_FC_CACHE_TRUE@ else \
+@HAVE_FC_CACHE_TRUE@ echo '$$HOME not set... giving up.' ; \
+@HAVE_FC_CACHE_TRUE@ fi \
+@HAVE_FC_CACHE_TRUE@ else \
+@HAVE_FC_CACHE_TRUE@ echo 'fc-cache not available... giving up.' ; \
+@HAVE_FC_CACHE_TRUE@ fi
+@HAVE_FC_CACHE_FALSE@ @echo "Preparing fontdir..." ; \
+@HAVE_FC_CACHE_FALSE@ cd $(DESTDIR)$(fontsdir) ; \
+@HAVE_FC_CACHE_FALSE@ bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \
+@HAVE_FC_CACHE_FALSE@ rm vice-cbm.bdf ; \
+@HAVE_FC_CACHE_FALSE@ mkfontdir .
# 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:
Copied: branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/vice-cbm.bdf (from rev 18794, trunk/vice/data/fonts/vice-cbm.bdf)
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/vice-cbm.bdf (rev 0)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/vice-cbm.bdf 2008-06-15 12:22:02 UTC (rev 18860)
@@ -0,0 +1,2503 @@
+STARTFONT 2.1
+FONT -freetype-VICE CBM-medium-r-normal-medium-12-120-100-72-m-104-symbol-0
+SIZE 12 100 100
+FONTBOUNDINGBOX 8 8 0 0
+STARTPROPERTIES 16
+POINT_SIZE 120
+PIXEL_SIZE 12
+RESOLUTION_X 100
+RESOLUTION_Y 72
+FONT_ASCENT 8
+FONT_DESCENT 0
+AVERAGE_WIDTH 104
+SPACING "M"
+FOUNDRY "FreeType"
+FAMILY_NAME "VICE CBM"
+CHARSET_REGISTRY "Symbol"
+WEIGHT_NAME "Medium"
+SLANT "R"
+SETWIDTH_NAME "Normal"
+COPYRIGHT "Typeface Commodore Business Machines"
+_XMBDFED_INFO "Converted by MP, Edited with xmbdfed 4.3."
+ENDPROPERTIES
+CHARS 192
+STARTCHAR char32
+ENCODING 32
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR char33
+ENCODING 33
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 2 7 3 1
+BITMAP
+C0
+C0
+C0
+C0
+00
+00
+C0
+ENDCHAR
+STARTCHAR char34
+ENCODING 34
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 3 1 5
+BITMAP
+CC
+CC
+CC
+ENDCHAR
+STARTCHAR char35
+ENCODING 35
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 7 0 1
+BITMAP
+66
+66
+FF
+66
+FF
+66
+66
+ENDCHAR
+STARTCHAR char36
+ENCODING 36
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+30
+7C
+C0
+78
+0C
+F8
+30
+ENDCHAR
+STARTCHAR char37
+ENCODING 37
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+C4
+CC
+18
+30
+60
+CC
+8C
+ENDCHAR
+STARTCHAR char38
+ENCODING 38
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 7 7 1 1
+BITMAP
+78
+CC
+78
+70
+CE
+CC
+7E
+ENDCHAR
+STARTCHAR char39
+ENCODING 39
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 4 3 3 5
+BITMAP
+30
+60
+C0
+ENDCHAR
+STARTCHAR char40
+ENCODING 40
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 4 7 2 1
+BITMAP
+30
+60
+C0
+C0
+C0
+60
+30
+ENDCHAR
+STARTCHAR char41
+ENCODING 41
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 4 7 2 1
+BITMAP
+C0
+60
+30
+30
+30
+60
+C0
+ENDCHAR
+STARTCHAR char42
+ENCODING 42
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 5 0 2
+BITMAP
+66
+3C
+FF
+3C
+66
+ENDCHAR
+STARTCHAR char43
+ENCODING 43
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 5 1 2
+BITMAP
+30
+30
+FC
+30
+30
+ENDCHAR
+STARTCHAR char44
+ENCODING 44
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 3 3 2 0
+BITMAP
+60
+60
+C0
+ENDCHAR
+STARTCHAR char45
+ENCODING 45
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 1 1 4
+BITMAP
+FC
+ENDCHAR
+STARTCHAR char46
+ENCODING 46
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 2 2 3 1
+BITMAP
+C0
+C0
+ENDCHAR
+STARTCHAR char47
+ENCODING 47
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 7 6 1 1
+BITMAP
+06
+0C
+18
+30
+60
+C0
+ENDCHAR
+STARTCHAR char48
+ENCODING 48
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+78
+CC
+DC
+EC
+CC
+CC
+78
+ENDCHAR
+STARTCHAR char49
+ENCODING 49
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+30
+30
+70
+30
+30
+30
+FC
+ENDCHAR
+STARTCHAR char50
+ENCODING 50
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+78
+CC
+0C
+18
+60
+C0
+FC
+ENDCHAR
+STARTCHAR char51
+ENCODING 51
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+78
+CC
+0C
+38
+0C
+CC
+78
+ENDCHAR
+STARTCHAR char52
+ENCODING 52
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 7 7 1 1
+BITMAP
+0C
+1C
+3C
+CC
+FE
+0C
+0C
+ENDCHAR
+STARTCHAR char53
+ENCODING 53
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+FC
+C0
+F8
+0C
+0C
+CC
+78
+ENDCHAR
+STARTCHAR char54
+ENCODING 54
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+78
+CC
+C0
+F8
+CC
+CC
+78
+ENDCHAR
+STARTCHAR char55
+ENCODING 55
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+FC
+CC
+18
+30
+30
+30
+30
+ENDCHAR
+STARTCHAR char56
+ENCODING 56
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+78
+CC
+CC
+78
+CC
+CC
+78
+ENDCHAR
+STARTCHAR char57
+ENCODING 57
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+78
+CC
+CC
+7C
+0C
+CC
+78
+ENDCHAR
+STARTCHAR char58
+ENCODING 58
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 2 4 3 2
+BITMAP
+C0
+00
+00
+C0
+ENDCHAR
+STARTCHAR char59
+ENCODING 59
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 3 6 2 0
+BITMAP
+60
+00
+00
+60
+60
+C0
+ENDCHAR
+STARTCHAR char60
+ENCODING 60
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+1C
+30
+60
+C0
+60
+30
+1C
+ENDCHAR
+STARTCHAR char61
+ENCODING 61
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 3 1 3
+BITMAP
+FC
+00
+FC
+ENDCHAR
+STARTCHAR char62
+ENCODING 62
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+E0
+30
+18
+0C
+18
+30
+E0
+ENDCHAR
+STARTCHAR char63
+ENCODING 63
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+78
+CC
+0C
+18
+30
+00
+30
+ENDCHAR
+STARTCHAR char0
+ENCODING 64
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+78
+CC
+DC
+DC
+C0
+C4
+78
+ENDCHAR
+STARTCHAR char1
+ENCODING 65
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+30
+78
+CC
+FC
+CC
+CC
+CC
+ENDCHAR
+STARTCHAR char2
+ENCODING 66
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+F8
+CC
+CC
+F8
+CC
+CC
+F8
+ENDCHAR
+STARTCHAR char3
+ENCODING 67
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+78
+CC
+C0
+C0
+C0
+CC
+78
+ENDCHAR
+STARTCHAR char4
+ENCODING 68
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+F0
+D8
+CC
+CC
+CC
+D8
+F0
+ENDCHAR
+STARTCHAR char5
+ENCODING 69
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+FC
+C0
+C0
+F0
+C0
+C0
+FC
+ENDCHAR
+STARTCHAR char6
+ENCODING 70
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+FC
+C0
+C0
+F0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR char7
+ENCODING 71
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+78
+CC
+C0
+DC
+CC
+CC
+78
+ENDCHAR
+STARTCHAR char8
+ENCODING 72
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+CC
+CC
+CC
+FC
+CC
+CC
+CC
+ENDCHAR
+STARTCHAR char9
+ENCODING 73
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 4 7 2 1
+BITMAP
+F0
+60
+60
+60
+60
+60
+F0
+ENDCHAR
+STARTCHAR char10
+ENCODING 74
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+3C
+18
+18
+18
+18
+D8
+70
+ENDCHAR
+STARTCHAR char11
+ENCODING 75
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+CC
+D8
+F0
+E0
+F0
+D8
+CC
+ENDCHAR
+STARTCHAR char12
+ENCODING 76
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+FC
+ENDCHAR
+STARTCHAR char13
+ENCODING 77
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 7 7 1 1
+BITMAP
+C6
+EE
+FE
+D6
+C6
+C6
+C6
+ENDCHAR
+STARTCHAR char14
+ENCODING 78
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+CC
+EC
+FC
+FC
+DC
+CC
+CC
+ENDCHAR
+STARTCHAR char15
+ENCODING 79
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+78
+CC
+CC
+CC
+CC
+CC
+78
+ENDCHAR
+STARTCHAR char16
+ENCODING 80
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+F8
+CC
+CC
+F8
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR char17
+ENCODING 81
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+78
+CC
+CC
+CC
+CC
+78
+1C
+ENDCHAR
+STARTCHAR char18
+ENCODING 82
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+F8
+CC
+CC
+F8
+F0
+D8
+CC
+ENDCHAR
+STARTCHAR char19
+ENCODING 83
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+78
+CC
+C0
+78
+0C
+CC
+78
+ENDCHAR
+STARTCHAR char20
+ENCODING 84
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+FC
+30
+30
+30
+30
+30
+30
+ENDCHAR
+STARTCHAR char21
+ENCODING 85
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+CC
+CC
+CC
+CC
+CC
+CC
+78
+ENDCHAR
+STARTCHAR char22
+ENCODING 86
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+CC
+CC
+CC
+CC
+CC
+78
+30
+ENDCHAR
+STARTCHAR char23
+ENCODING 87
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 7 7 1 1
+BITMAP
+C6
+C6
+C6
+D6
+FE
+EE
+C6
+ENDCHAR
+STARTCHAR char24
+ENCODING 88
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+CC
+CC
+78
+30
+78
+CC
+CC
+ENDCHAR
+STARTCHAR char25
+ENCODING 89
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+CC
+CC
+CC
+78
+30
+30
+30
+ENDCHAR
+STARTCHAR char26
+ENCODING 90
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 1
+BITMAP
+FC
+0C
+18
+30
+60
+C0
+FC
+ENDCHAR
+STARTCHAR char27
+ENCODING 91
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 4 7 2 1
+BITMAP
+F0
+C0
+C0
+C0
+C0
+C0
+F0
+ENDCHAR
+STARTCHAR char28
+ENCODING 92
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 7 7 0 1
+BITMAP
+0C
+12
+30
+7C
+30
+62
+FC
+ENDCHAR
+STARTCHAR char29
+ENCODING 93
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 4 7 2 1
+BITMAP
+F0
+30
+30
+30
+30
+30
+F0
+ENDCHAR
+STARTCHAR char30
+ENCODING 94
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 7 1 0
+BITMAP
+30
+78
+FC
+30
+30
+30
+30
+ENDCHAR
+STARTCHAR char31
+ENCODING 95
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 7 6 1 1
+BITMAP
+20
+60
+FE
+FE
+60
+20
+ENDCHAR
+STARTCHAR char64
+ENCODING 96
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 2 0 3
+BITMAP
+FF
+FF
+ENDCHAR
+STARTCHAR char65
+ENCODING 97
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 7 7 1 1
+BITMAP
+10
+38
+7C
+FE
+FE
+38
+7C
+ENDCHAR
+STARTCHAR char66
+ENCODING 98
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 8 0 0
+BITMAP
+18
+18
+18
+18
+18
+18
+18
+18
+ENDCHAR
+STARTCHAR char67
+ENCODING 99
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 2 0 3
+BITMAP
+FF
+FF
+ENDCHAR
+STARTCHAR char68
+ENCODING 100
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 2 0 4
+BITMAP
+FF
+FF
+ENDCHAR
+STARTCHAR char69
+ENCODING 101
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 2 0 5
+BITMAP
+FF
+FF
+ENDCHAR
+STARTCHAR char70
+ENCODING 102
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 2 0 2
+BITMAP
+FF
+FF
+ENDCHAR
+STARTCHAR char71
+ENCODING 103
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 8 0 0
+BITMAP
+30
+30
+30
+30
+30
+30
+30
+30
+ENDCHAR
+STARTCHAR char72
+ENCODING 104
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 8 0 0
+BITMAP
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+ENDCHAR
+STARTCHAR char73
+ENCODING 105
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 5 5 0 0
+BITMAP
+E0
+F0
+38
+18
+18
+ENDCHAR
+STARTCHAR char74
+ENCODING 106
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 5 5 3 3
+BITMAP
+C0
+C0
+E0
+78
+38
+ENDCHAR
+STARTCHAR char75
+ENCODING 107
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 5 5 0 3
+BITMAP
+18
+18
+38
+F0
+E0
+ENDCHAR
+STARTCHAR char76
+ENCODING 108
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 8 0 0
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+FF
+FF
+ENDCHAR
+STARTCHAR char77
+ENCODING 109
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 8 0 0
+BITMAP
+C0
+E0
+70
+38
+1C
+0E
+07
+03
+ENDCHAR
+STARTCHAR char78
+ENCODING 110
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 8 0 0
+BITMAP
+03
+07
+0E
+1C
+38
+70
+E0
+C0
+ENDCHAR
+STARTCHAR char79
+ENCODING 111
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 8 0 0
+BITMAP
+FF
+FF
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR char80
+ENCODING 112
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 8 0 0
+BITMAP
+FF
+FF
+03
+03
+03
+03
+03
+03
+ENDCHAR
+STARTCHAR char81
+ENCODING 113
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 6 1 1
+BITMAP
+78
+FC
+FC
+FC
+FC
+78
+ENDCHAR
+STARTCHAR ch...
[truncated message content] |