diff -Nru lierolibre-0.4/COPYING lierolibre-0.5/COPYING --- lierolibre-0.4/COPYING 2012-06-10 10:42:11.000000000 +0000 +++ lierolibre-0.5/COPYING 2012-11-08 22:13:22.000000000 +0000 @@ -1,17 +1,21 @@ lierolibre, the gvl library, and the data helper scripts are released under the -BDS-2-Clause License +BDS-2-Clause License. The original graphics for Liero, the new replacement sounds, and the configuration variables extracted from the original game are released under -the WTFPL license. Note that the old freeware license in data/LIERO(ENG).TXT +the WTFPL License. Note that the old freeware license in data/LIERO(ENG).TXT +and the information about the old LIERO.EXE and LIERO.SND in data/LICENSE.TXT no longer applies. +The filesystem code and the lfs header originates from Boost and is licensed +under the Boost Software License 1.0 and under the BSD-2-Clause License. + The type_info header is licensed under the Boost Software License 1.0, and is included in the gvl library. The SDL m4 script is LGPLv2.1+. -The autotools content is in part licensed under the BSD-2-Clause license of +The autotools content is in part licensed under the BSD-2-Clause License of lierolibre, and also under various custom permissive free software licenses. The content under the BSD-2-Clause license falls under the GPL-2+ if used outside of lierolibre. @@ -40,17 +44,30 @@ 2012, Martin Erik Werner License: WTFPL and BSD-2-Clause -Files: src/boostTesting.cpp src/configHelper.* src/configInit.* src/dataPath.* - src/to_string.* +Files: src/argParse.* src/boostTesting.cpp src/configCompat.cpp + src/configHelper.* src/configInit.* src/dataPath.* src/to_string.* Copyright: 2012, Martin Erik Werner License: BSD-2-Clause -Files: src/console.* src/exactObjectList.hpp src/fastObjectList.hpp src/lfs.hpp - src/rand.* src/rect.hpp src/sdlmain.cpp src/sfx.* src/sobject.* src/sys.* +Files: src/console.* src/exactObjectList.hpp src/fastObjectList.hpp src/rand.* + src/rect.hpp src/sdlmain.cpp src/sfx.* src/sobject.* src/sys.* src/text.* src/_build/* Copyright: 2007-2010, Erik Lindroos License: BSD-2-Clause +Files: src/filesystem.hpp +Copyright: 2001, Dietmar Kühl + 2002, Jan Langer + 2002-2003, Beman Dawes + 2007-2010, Erik Lindroos + 2010, "basro" +License: BSL-1.0 and BSD-2-Clause + +Files: src/filesystem.cpp +Copyright: 2002, Jens Maurer + 2007-2010, Erik Lindroos +License: BSL-1.0 and BSD-2-Clause + Files: src/binReader.* src/constants.* src/main.cpp src/math.* src/reader.* Copyright: 2007-2010, Erik Lindroos 2012, Martin Erik Werner @@ -66,10 +83,11 @@ Files: data/* Copyright: 1998-1999 Joosa Reikkinen "Mets„nEl„imet" License: WTFPL -Comment: Note that the old freeware license in data/LIERO(ENG).TXT no longer - applies. +Comment: Note that the old freeware license in data/LIERO(ENG).TXT and the + information about the old LIERO.EXE and LIERO.SND in data/LICENSE.TXT + no longer applies. -Files: data/sounds/*.wav +Files: data/sounds/*.wav data/LIERO.SND Copyright: 2012, "sea" License: WTFPL diff -Nru lierolibre-0.4/COPYING_winbin lierolibre-0.5/COPYING_winbin --- lierolibre-0.4/COPYING_winbin 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/COPYING_winbin 2012-11-15 20:48:47.000000000 +0000 @@ -0,0 +1,54 @@ +START_HUMAN_READABLE + +The included SDL shared library is licensed under LGPLv2.1+. The source code +for this library is located in "libsrc\SDL-1.2.15". + +The statically linked libconfig++ library is licensed under LGPLv2.1+. The +source code for this library is located in "libsrc\libconfig-1.4.8". + +The included SDL_mixer shared library is licensed under the Zlib license. + +The included Zlib shared library is licensed under the Zlib license. + +The included boost_program_options shared library is licensed under the BSL-1.0. + +The included MS Visual Studio C++ shared libraries are included under the same +license as lierolibre, namely the BSD-2-Clause license. +END_HUMAN_READABLE +START_MACHINE_READABLE + +Files: lierolibre.exe +Copyright: 2007-2010, Erik Lindroos + 2010, Mario Carbajal "basro" + 2012, Martin Erik Werner + 2005-2011 Mark A Lindner +License: BSD-2-Clause +Comment: The LGPL-2.1+ libconfig++ library is statically linked into this binary. + +Files: data/lierocfg.txt +Copyright: 1998-1999 Joosa Reikkinen "Mets„nEl„imet" + 2012 Martin Erik Werner +License: WTFPL + +Files: NEWS.txt +Copyright: 1998-1999 Joosa Reikkinen "Mets„nEl„imet" + 2007-2010, Erik Lindroos + 2012, Martin Erik Werner +License: WTFPL and BSD-2-Clause + +Files: SDL.dll libsrc/SDL-1.2.15/* +Copyright: 1997-2012 Sam Lantinga +License: LGPL-2.1+ + +Files: libsrc/libconfig-1.4.8/* +Copyright: 2005-2011 Mark A Lindner +License: LGPL-2.1+ + +Files: SDL_mixer.dll +Copyright: 1997-2012 Sam Lantinga +License: Zlib + +Files: boost_program_options.dll +Copyright: Various Boost authors +License: BSL-1.0 +END_MACHINE_READABLE diff -Nru lierolibre-0.4/ChangeLog lierolibre-0.5/ChangeLog --- lierolibre-0.4/ChangeLog 2012-06-11 22:58:56.000000000 +0000 +++ lierolibre-0.5/ChangeLog 2012-11-15 20:44:29.000000000 +0000 @@ -1,3 +1,1052 @@ +commit 1ba4f6e602b56a0f0b1c397eb76e80baac1a1b92 (origin/master) +Author: Martin Erik Werner +Date: Thu Nov 15 18:06:40 2012 +0100 + + no need to copy README_linuxbin again + + Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit 898f85de8ad0a75eefd020b20c347fc8b97d65fe +Author: Martin Erik Werner +Date: Thu Nov 15 14:30:26 2012 +0100 + + dist-nixbin-libcopyright is .PHONY as well + + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bfe2fd607270309c9ec3313c3112f1b06bfd99fc +Author: Martin Erik Werner +Date: Thu Nov 15 14:16:18 2012 +0100 + + windows distdir: do space renaming here as well + + Makefile.am | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit d8637fded328d1e7d291e0f9e77cc9d01d0f92bb +Author: Martin Erik Werner +Date: Thu Nov 15 11:34:40 2012 +0100 + + manpages: fix small typo + + man/lierolibre.6.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0e17e87a6443b5f9429bd47eedd3859c7bfc791c +Author: Martin Erik Werner +Date: Mon Nov 12 22:02:31 2012 +0100 + + mktemp has different syntax... + + src/filesystem.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9ceee53293230ab7ec0ffc61663414a72ef10a06 +Author: Martin Erik Werner +Date: Mon Nov 12 21:56:39 2012 +0100 + + _mktemp_s() is not in mingw (yet), use _mktemp() + + src/filesystem.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 1ccdf977346a879ef29e486939b979c7b91e5c87 +Author: Martin Erik Werner +Date: Mon Nov 12 13:54:08 2012 +0100 + + windows submodule: boost and folder filters for VSC + + windows | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c4be38ae08258f82a2b79952934b0ae6bbcdffa2 +Author: Martin Erik Werner +Date: Sun Nov 11 17:03:27 2012 +0100 + + custom jam file for mingw, windows submodule + + Makefile.am | 2 +- + windows | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit cec89caf5749a8432130a3180b5e77a41f80d72a +Author: Martin Erik Werner +Date: Sun Nov 11 13:06:43 2012 +0100 + + windows submodule: working visualC + + windows | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit eaa5268734fb53533a2c4a7464b9dd4bb9fb1686 +Author: Martin Erik Werner +Date: Sat Nov 10 11:03:43 2012 +0100 + + windows submodule: fix some visualC paths + + windows | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit be6f9e61172b2da628b0b54f95598a83e1ddbde4 +Author: Martin Erik Werner +Date: Fri Nov 9 00:05:34 2012 +0100 + + Makefile.am: nodist_pkgdata_DATA no longer exist + + Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit b9d3a6fa50dee4a978a58cce1b56956105c0f566 +Author: Martin Erik Werner +Date: Thu Nov 8 23:56:35 2012 +0100 + + nixbin: don't copy CHR/SND blobs, libcap location + + Makefile.am | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit e1415d732b91275f4ce4e48a06b1418555b633b6 +Author: Martin Erik Werner +Date: Thu Nov 8 23:14:41 2012 +0100 + + License for bits from boost filesystem and lfs + + COPYING | 24 ++++++++++++++++++++---- + src/filesystem.cpp | 38 +++++++++++++++++++++++++++++++++++--- + src/filesystem.hpp | 40 +++++++++++++++++++++++++++++++++++++--- + src/lfs.hpp | 33 +++++++++++++++++++++++++++++++-- + 4 files changed, 123 insertions(+), 12 deletions(-) + +commit f47a7c09a76d059ed4aede2b8c34b8d3bb685d9a +Author: Martin Erik Werner +Date: Thu Nov 8 22:17:38 2012 +0100 + + add boostTesting.cpp to tarball + + Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 269f2d95ac48d05a274673b5a1d6df7748c21932 +Author: Martin Erik Werner +Date: Thu Nov 8 22:02:49 2012 +0100 + + define LIBCONFIGXX_STATIC for cross-compile + + Makefile.am | 2 +- + configure.ac | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 68c18525cfe13024de4526cf2dffffaf1fefc1bd +Author: Martin Erik Werner +Date: Thu Nov 8 17:21:24 2012 +0100 + + include sounds.txt in tarball + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 3470157b8f1c509ecdac12b0775e2bfcd973fff1 +Author: Martin Erik Werner +Date: Thu Nov 8 13:57:40 2012 +0100 + + describe --enable-windows-libraries more + + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit dcade6c235a72ee29ccdab2e46c60b4c340e8de9 +Author: Martin Erik Werner +Date: Thu Nov 8 12:47:13 2012 +0100 + + set relevant doc files as no-install + + Makefile.am | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit bcfdc76861fb6d9c6a91e91bc8deacf4a0d91885 +Author: Martin Erik Werner +Date: Wed Nov 7 16:46:26 2012 +0100 + + Revert "Special case key remap only on *nix" + + This reverts commit 2e54d8665e632d4a9d7c5626ddc6e5ed45643f92. + + Turns out it's windows emitting LCTRL + RALT on AltGr press, + needs solving elsewise. + + src/keys.cpp | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +commit 375fffc7c512150173df588eee5dfbb1242eb146 +Author: Martin Erik Werner +Date: Wed Nov 7 14:58:49 2012 +0100 + + Update NEWS + + NEWS | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit d5b8c7d7443f81553ccc0ed065f2f6e00ca72012 +Author: Martin Erik Werner +Date: Wed Nov 7 14:56:44 2012 +0100 + + run distdir in cross-compile script + + scripts/cross-compile | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 0c018105205bfe75d40c83bd2a016cfa676a5a52 +Author: Martin Erik Werner +Date: Wed Nov 7 14:41:55 2012 +0100 + + fix MetsänEläimet chars :) + + COPYING_winbin | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0abf193784a17c46d3dfd238266f4af73957e4b4 +Author: Martin Erik Werner +Date: Wed Nov 7 14:36:25 2012 +0100 + + remove COPYING.txt in Makefile + + Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit b9e265fdb8f08c5b8fb7acaee880ad8ee7951525 +Author: Martin Erik Werner +Date: Wed Nov 7 14:35:14 2012 +0100 + + add msvc*100.dll files to archive + + Makefile.am | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit abd27e4010fd5de5f208f6ad616ed3b562071b6a +Author: Martin Erik Werner +Date: Wed Nov 7 14:33:25 2012 +0100 + + tweak COPYING: sound blob, disregard LICENSE.TXT + + COPYING | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit a613a5d9ccc7766df1da1170cd6eeb38e18e3c09 +Author: Martin Erik Werner +Date: Wed Nov 7 14:29:46 2012 +0100 + + Don't store COPYING.txt + + COPYING.txt | 198 ----------------------------------------------------------- + 1 file changed, 198 deletions(-) + +commit dce7c026eb96d8eab2ef8f526fc82c2f53af2dd6 +Author: Martin Erik Werner +Date: Wed Nov 7 14:26:47 2012 +0100 + + Create winbin COPYING.txt by insertion + + COPYING_winbin | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + Makefile.am | 18 +++++++++++--- + 2 files changed, 86 insertions(+), 3 deletions(-) + +commit be8e548ccc0af9ba51630b4a68bf4b1001fc107a +Author: Martin Erik Werner +Date: Wed Nov 7 13:43:41 2012 +0100 + + ship LIERO.CHR and LIERO.SND packed + + Makefile.am | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +commit dc7fc7a3a908e8d65deb4e0e1a6fa76cc6782ee7 +Author: Martin Erik Werner +Date: Wed Nov 7 00:39:15 2012 +0100 + + update COPYING.txt a bit, needs much more + + COPYING.txt | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit caabc075fd647fa19c35981e2e91c4867af76c5a +Author: Martin Erik Werner +Date: Wed Nov 7 00:25:43 2012 +0100 + + fix miss in makefile sed command + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 870ed4ba13d5dedff2b7256d6751d97b758ddd2b +Author: Martin Erik Werner +Date: Wed Nov 7 00:21:51 2012 +0100 + + don't use tagged names for boost lib + + Makefile.am | 6 +++--- + configure.ac | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 9f0e478bf415f349046734ecdd1f6f1a768254c5 +Author: Martin Erik Werner +Date: Tue Nov 6 23:47:37 2012 +0100 + + store and ship windows text files as CRLF + + COPYING.txt | 400 +++++++++++------------ + Makefile.am | 6 +- + README.txt | 116 +++---- + data | 2 +- + lgpl-2.1.txt | 1004 +++++++++++++++++++++++++++++----------------------------- + 5 files changed, 764 insertions(+), 764 deletions(-) + +commit 2e54d8665e632d4a9d7c5626ddc6e5ed45643f92 +Author: Martin Erik Werner +Date: Tue Nov 6 23:30:31 2012 +0100 + + Special case key remap only on *nix + + It appears RALT is really inconsistent between *nix and win, make it + only apply for linux then, I guess. + + src/keys.cpp | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit e5559be791aad2dbb0d1827ca158d2b987afdd4b +Author: Martin Erik Werner +Date: Tue Nov 6 23:29:53 2012 +0100 + + work around boost inability to do simple clean + + Makefile.am | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit b71a19b8b59f6fd677810f9eefa3ed53fa62064a +Author: Martin Erik Werner +Date: Tue Nov 6 20:35:59 2012 +0100 + + data submodule: revert RALT rebind + + data | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 802d007cfe47513d85a3a2346af0c80748c03ce3 +Author: Martin Erik Werner +Date: Tue Nov 6 20:27:57 2012 +0100 + + Fix windows archive, ship full source + + Makefile.am | 23 +++++------------------ + 1 file changed, 5 insertions(+), 18 deletions(-) + +commit 3d167bbce23f6b1d16f485d597545ec62d6f9791 +Author: Martin Erik Werner +Date: Tue Nov 6 18:58:36 2012 +0100 + + Avoid stdc++ and gcc by linking libconfig++ statically + + Since we don't want to ship DLL files for libgcc and libstdc++ and + libconfig seems unable to produce a DLL file where these two are + statically linked, the only way around seems to be to link + libconfig++ statically. + + This means we need to ship the full lierolibre source to enable + relinking, even in the binary package. + + Makefile.am | 15 +++++++++------ + configure.ac | 10 ++++------ + 2 files changed, 13 insertions(+), 12 deletions(-) + +commit c9c4fe009e23dd7a8be249f0d55323230d6ae6aa +Author: Martin Erik Werner +Date: Mon Nov 5 15:03:50 2012 +0100 + + Special case for RALT on *nix in SDLToDOSKey() + + On *nix, RALT seems to produce a different scancode than on windows, + in order to use one keybind for both, translate the *nix code to the + windows equivalent (default for liero), in an ugly special case. + + src/keys.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +commit 896728996366ff40d18e8b6de94752d106b72123 +Author: Martin Erik Werner +Date: Fri Nov 2 14:46:01 2012 +0100 + + include libgcc_s and libstdc++ dlls + + Makefile.am | 5 ++++- + configure.ac | 3 +++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit df1bd1cb3959e0e59bd4c17e87347b089a0569b4 +Author: Martin Erik Werner +Date: Fri Nov 2 12:36:40 2012 +0100 + + strip and static-link dll files + + Makefile.am | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit a358115e62d2ac7e2483f8f47e4499b0221b7bed +Author: Martin Erik Werner +Date: Wed Oct 31 21:43:32 2012 +0100 + + create empty user dir in win dist + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit f1f7728d6cb4036385dee79b4551c1daec14b52d +Author: Martin Erik Werner +Date: Wed Oct 31 21:42:33 2012 +0100 + + changelog: settings->user on windows + + NEWS | 1 + + 1 file changed, 1 insertion(+) + +commit 0538e8d6f58e425089a45d5c904aea70ce6ad85b +Author: Martin Erik Werner +Date: Wed Oct 31 21:24:05 2012 +0100 + + fix boost dll lib name + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7b21eca3c7b9894350d0bf5cee745cae7621330b +Author: Martin Erik Werner +Date: Wed Oct 31 21:20:01 2012 +0100 + + add missing make in cross-compile + + scripts/cross-compile | 1 + + 1 file changed, 1 insertion(+) + +commit 395d7176e1f0c04e40afbbda972e9ae68a98e7db +Author: Martin Erik Werner +Date: Wed Oct 31 21:12:12 2012 +0100 + + Implement winbin distdir + + * Checks HAS_WINDOWS_LDFLAGS and if true adds to dist-hook target + + Copies (strips) and/or renames win-specific files + + Adds libsrc with SDL and libconfig + + Makefile.am | 36 ++++++++++++++++++++++++++++++++++-- + 1 file changed, 34 insertions(+), 2 deletions(-) + +commit c80da179507684ba251c49f4f13f7999e7a47c33 +Author: Martin Erik Werner +Date: Wed Oct 31 21:11:37 2012 +0100 + + windows submodule: set dll files executable + + windows | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 42153a4ee9854fbfd11e519ace5072b707dda83d +Author: Martin Erik Werner +Date: Wed Oct 31 18:16:57 2012 +0100 + + use "user" instead of "settings" as homedir on windows + + README.txt | 4 ++-- + src/dataPath.cpp | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit d40e0764d0a0f86230df1cc926aaef50f8cba459 +Author: Martin Erik Werner +Date: Tue Oct 30 23:29:45 2012 +0100 + + reduce cross-compiling script to invoking autotools correctly + + scripts/cross-compile | 29 +---------------------------- + 1 file changed, 1 insertion(+), 28 deletions(-) + +commit 861ab160fa970ed98b2a427564a0f49892ecee02 +Author: Martin Erik Werner +Date: Tue Oct 30 22:29:35 2012 +0100 + + move cross-compile script contents to autotools + + * Add configure options + + --enable-windows-includes sets CPPFLAGS + + --enable-windows-libraries sets LDFLAGS + * Add (hardcoded path) dependencies on dll files + * lierolibre now depends on dll files if --enable-windows-libraries + is used + * Add make targets for all dll files + * Tweak some x"$var" = xyes tests + + Makefile.am | 33 +++++++++++++++++++++++++++++++-- + configure.ac | 17 +++++++++++++++-- + 2 files changed, 46 insertions(+), 4 deletions(-) + +commit 3aaf7680f66cdbcf5afdf82f0267ad4d340c3360 +Author: Martin Erik Werner +Date: Sun Oct 28 18:49:22 2012 +0100 + + single line in cross-compile, easier to test + + scripts/cross-compile | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +commit c347c4c61bd9159c5dc5f0cbf7a498d308d671ef +Author: Martin Erik Werner +Date: Sat Oct 27 16:22:27 2012 +0200 + + fix path and revert to blob SDL_mixer in cross-compile + + scripts/cross-compile | 17 ++++++----------- + windows | 2 +- + 2 files changed, 7 insertions(+), 12 deletions(-) + +commit 7c81be9af0e6e38a0053d354cdf5fbfc9fd36be6 +Author: Martin Erik Werner +Date: Sat Oct 27 15:40:52 2012 +0200 + + autogen in cross-compile scripts + + scripts/cross-compile | 1 + + 1 file changed, 1 insertion(+) + +commit 4703795449b7af9cd86cede04b8c4d5aa34cc50b +Author: Martin Erik Werner +Date: Sat Oct 27 14:40:21 2012 +0200 + + lib->windows in cross-compile script + + scripts/cross-compile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 73272575434b8de3c5f6f78f3a9019664e1ac898 +Author: Martin Erik Werner +Date: Sat Oct 27 13:30:17 2012 +0200 + + work around spaces in gvl files + + Makefile.am | 13 +++++++++++-- + src/gvl | 2 +- + 2 files changed, 12 insertions(+), 3 deletions(-) + +commit 1a2cba3b5bbeaea29a585a9da32a949d62a1e7c9 +Author: Martin Erik Werner +Date: Sat Oct 27 02:32:15 2012 +0200 + + add windows vcproj files to source tarball + + Makefile.am | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) + +commit 61d6b2abc6a4ce554ab776ca43ef7460edf156f2 +Author: Martin Erik Werner +Date: Sat Oct 27 01:53:59 2012 +0200 + + move windows build files to windows submodule + + scripts/assemble-release.bat | 26 -- + src/_build/liero.vcproj | 841 ------------------------------------------ + src/_build/liero.vcxproj | 271 -------------- + src/_build/lierolibre.sln | 109 ------ + windows | 2 +- + 5 files changed, 1 insertion(+), 1248 deletions(-) + +commit 7deb488b6a3dc49ad5fdca7d23cf364d1d88fd93 +Author: Martin Erik Werner +Date: Sat Oct 27 01:39:51 2012 +0200 + + rename lib submodule to windows + + .gitmodules | 4 ++-- + lib | 1 - + windows | 1 + + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 6a4b4a10425cb987fa53854e90c19903e0e55805 +Author: Martin Erik Werner +Date: Sat Oct 27 01:07:14 2012 +0200 + + data submodule: add windows lierocfg file + + data | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8e4e2c02b78bf124a7dc16871dbb939f29410830 +Author: Martin Erik Werner +Date: Sat Oct 27 00:54:49 2012 +0200 + + documentation and script fixes + + * Remove windows ChangeLog (since windows branch is merged) + * Include more windows files in source tarball + * Move scripts to scripts/ + + ChangeLog.txt | 6760 ------------------------------------------ + Makefile.am | 15 +- + assemble-release.bat | 25 - + cross-compile | 44 - + scripts/assemble-release.bat | 26 + + scripts/cross-compile | 44 + + 6 files changed, 81 insertions(+), 6833 deletions(-) + +commit abc4d73e29a07b4042d902e0f9d8d71ace678244 (windows) +Merge: c4c4b43 18d529b +Author: Martin Erik Werner +Date: Fri Oct 26 22:25:07 2012 +0200 + + Merge branch 'master' into windows + +commit c4c4b433854da07d8918e0150f584561b4688ca5 +Author: Martin Erik Werner +Date: Fri Oct 26 22:23:55 2012 +0200 + + lib submodule: update, cross-compile fixes + + lib | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 18d529bc6c57e7e0d1dd4db2583df95f9117fc53 +Author: Martin Erik Werner +Date: Fri Oct 26 21:37:17 2012 +0200 + + update and change cross-compile readme into a script + + README_cross-compile | 26 -------------------------- + cross-compile | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 44 insertions(+), 26 deletions(-) + +commit 9738b94536262fedaae6f3c2e5208542fb99d994 +Author: Martin Erik Werner +Date: Thu Oct 25 19:51:45 2012 +0200 + + data submodule: use windows branch + + data | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5cf259c123cf0ba63a9367043f8784f7ee17d992 +Merge: 280fa2f f1f9649 +Author: Martin Erik Werner +Date: Thu Oct 25 19:47:44 2012 +0200 + + Merge branch 'master' into windows + +commit f1f964984bb61479e93461099f1a0ea957699b76 +Author: Martin Erik Werner +Date: Thu Oct 25 19:36:03 2012 +0200 + + update NEWS + + NEWS | 2 ++ + 1 file changed, 2 insertions(+) + +commit 154fab94394c1893ee3d76414bc0625deb7a2c6b +Author: Martin Erik Werner +Date: Thu Oct 25 12:07:33 2012 +0200 + + Set controls after archive load if null + + Do a check if liero_archive loaded empty data into controlsEx[] and + use values from controls[] and/or a default set if that is the case. + + src/settings.cpp | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit ac2a00222066ffa1d0ecd0c333906181b8afbd90 +Author: Martin Erik Werner +Date: Sat Oct 13 17:36:07 2012 +0200 + + set new default RALT in defControls + + src/settings.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5915af42e3df4d5e8b351c9c0603dd8b4cee6b5c +Author: Martin Erik Werner +Date: Sat Oct 13 16:05:47 2012 +0200 + + data submodule: fix Right Alt + + data | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 924fcec8012168621fa5a156aede0bed77a26596 +Author: Martin Erik Werner +Date: Sat Oct 13 16:04:50 2012 +0200 + + update NEWS + + NEWS | 2 ++ + 1 file changed, 2 insertions(+) + +commit f5eea2738ad815e8b1029346a0059c9a13955525 +Author: Martin Erik Werner +Date: Sat Oct 13 14:45:04 2012 +0200 + + remove fullscreen resolution option + + This option currently does nothing anyways, probably nice to + implement as an alternative to the F# keys though, later on. + + src/gfx.cpp | 6 +----- + src/menu/hiddenMenu.cpp | 4 ---- + src/menu/hiddenMenu.hpp | 2 -- + src/settings.cpp | 2 -- + src/settings.hpp | 9 +-------- + 5 files changed, 2 insertions(+), 21 deletions(-) + +commit 68e2cfb9cbe4fdf16218fdc56d9b5331909ea33d +Author: Martin Erik Werner +Date: Thu Oct 11 23:52:32 2012 +0200 + + manpage: dir->write correction + + man/lierolibre.6.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9defa5e45c219dec361436731a458f7cc5d9c9a4 +Author: Martin Erik Werner +Date: Tue Oct 9 14:34:33 2012 +0200 + + More cross-compile readme, figured dynamic linking + + README_cross-compile | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit 280fa2f6fbecce126f630320a517d90c35b1a4e5 +Merge: 652dc5f 2f204a0 +Author: Martin Erik Werner +Date: Tue Oct 9 12:18:20 2012 +0200 + + Merge branch 'master' into windows + +commit 2f204a01baac7b92b6b9fda8cd55a80eb54bd46a +Author: Martin Erik Werner +Date: Tue Oct 9 12:13:40 2012 +0200 + + more comments for cross-compile + + README_cross-compile | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +commit 652dc5ffeac90cff3cee5042dc0b945014407009 +Merge: 978a124 01a7cf0 +Author: Martin Erik Werner +Date: Sun Oct 7 23:54:47 2012 +0200 + + Merge branch 'master' into windows + +commit 01a7cf0ea7d4d73a22dd367c7019035826a68da1 +Author: Martin Erik Werner +Date: Sun Oct 7 23:46:01 2012 +0200 + + Make "Randomize" colour proper beige-ish + + c.f. http://code.google.com/p/liero/issues/detail?id=2 + + src/weapsel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6675d913dff2a8d311d87cf008604425bfe1d3a9 +Author: Martin Erik Werner +Date: Sat Sep 29 18:51:58 2012 +0200 + + Add cross-compile bits and bobs + + README_cross-compile | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 978a1244d0365262dd09d9169a031e4bf08320d8 +Merge: d2c2d4c 06afb45 +Author: Martin Erik Werner +Date: Sat Sep 29 11:35:33 2012 +0200 + + Merge branch 'master' into windows + +commit 06afb45602b7bd1180ec39cc22b9944129cc4e7f +Author: Martin Erik Werner +Date: Sat Sep 29 10:56:04 2012 +0200 + + Update NEWS + + NEWS | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 272c3f471b992815c9e6805193b979a2238928d8 +Author: Martin Erik Werner +Date: Sat Sep 29 10:49:27 2012 +0200 + + -set colorspace to fix XPM, submodule back to XPM + + data | 2 +- + scripts/lierolibre-packgfx | 6 +++--- + scripts/lierolibre-packlev | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 177c60f96076133e18ae993cd2688d4d8f57e112 +Author: Martin Erik Werner +Date: Sat Sep 29 10:43:55 2012 +0200 + + Revert back to XPM icons + + Revert "Better PNM format" + This reverts commit 9ccdefd690b93bab6cd496126419f8607d8d151f. + + Revert "Change to using PNM files instead of XPM" + This reverts commit d4d25e164f8bb90c15e1499233e410ca932f9582. + + Makefile.am | 8 ++++---- + data | 2 +- + man/lierolibre-extractgfx.6.am | 4 ++-- + man/lierolibre-extractlev.6.am | 6 +++--- + man/lierolibre-packgfx.6.am | 12 ++++++------ + man/lierolibre-packlev.6.am | 6 +++--- + scripts/lierolibre-extractgfx | 38 ++++++++++---------------------------- + scripts/lierolibre-extractlev | 17 +++++------------ + scripts/lierolibre-packgfx | 4 ++-- + scripts/lierolibre-packlev | 4 ++-- + 10 files changed, 38 insertions(+), 63 deletions(-) + +commit c651cade423a3fdabc16a554e61f867978c90811 (tag: lierolibre-0.4.1) +Author: Martin Erik Werner +Date: Fri Sep 28 03:17:53 2012 +0200 + + Update changelog, now --decorate:d + + ChangeLog | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 111 insertions(+), 5 deletions(-) + +commit 90deea427df9772453ebd5260a7a105aaf4844ce +Author: Martin Erik Werner +Date: Fri Sep 28 03:17:31 2012 +0200 + + automake: change libogg path + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 96ba2e736e38d8a8fe96e1713dfc2d1fb3247e5c +Author: Martin Erik Werner +Date: Fri Sep 28 02:32:27 2012 +0200 + + automake: more efficient download of libsrc + + Makefile.am | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 1107d90b237945a37ff21bddc276b679779ef60e +Author: Martin Erik Werner +Date: Fri Sep 28 01:29:43 2012 +0200 + + Bump to version 0.4.1 in configure.ac + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9ccdefd690b93bab6cd496126419f8607d8d151f +Author: Martin Erik Werner +Date: Fri Sep 28 00:51:23 2012 +0200 + + Better PNM format + + data | 2 +- + scripts/lierolibre-extractgfx | 15 ++++++--------- + 2 files changed, 7 insertions(+), 10 deletions(-) + +commit 8ccba2974286ca29daae7beb64085564cadc78fc +Author: Martin Erik Werner +Date: Fri Sep 28 00:24:26 2012 +0200 + + fix erroneous xpm->pnm replace for icon + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 21532da8786c3e01d72ce415989a3ce6e8f99f44 +Author: Martin Erik Werner +Date: Thu Sep 27 15:04:55 2012 +0200 + + Update NEWS for 0.4.1 + + NEWS | 5 +++++ + 1 file changed, 5 insertions(+) + +commit d4d25e164f8bb90c15e1499233e410ca932f9582 +Author: Martin Erik Werner +Date: Thu Sep 27 04:16:22 2012 +0200 + + Change to using PNM files instead of XPM + + It appears PNM files, due to their raw values, are easier to + convert reliably. + + Makefile.am | 10 +++++----- + data | 2 +- + man/lierolibre-extractgfx.6.am | 4 ++-- + man/lierolibre-extractlev.6.am | 6 +++--- + man/lierolibre-packgfx.6.am | 12 ++++++------ + man/lierolibre-packlev.6.am | 6 +++--- + scripts/lierolibre-extractgfx | 41 ++++++++++++++++++++++++++++++---------- + scripts/lierolibre-extractlev | 17 ++++++++++++----- + scripts/lierolibre-packgfx | 4 ++-- + scripts/lierolibre-packlev | 4 ++-- + 10 files changed, 67 insertions(+), 39 deletions(-) + +commit 3f3862d765a1450319de6f641dec7194ee46db9c +Author: Martin Erik Werner +Date: Thu Sep 27 03:16:10 2012 +0200 + + Set LANG=C in packsounds script to make sure we can grep "bytes" + + scripts/lierolibre-packsounds | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7e9180a936d497e5bd2f8b5d11bebd90f33f793d +Author: Martin Erik Werner +Date: Sat Jun 23 14:15:41 2012 +0200 + + Fix configure creating files from messages + + Add [] quoting to all messages in order to avoid "," being + interpreted as a separator and causing creation of files + + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 7a6fb27cf3a75830ed540a8b22f62b8f1e9aee76 +Author: Martin Erik Werner +Date: Tue Jun 12 14:01:10 2012 +0200 + + Add some files to COPYING + + COPYING | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d2c2d4cb0bc6cf128e70b80643e6fb0061c84306 (tag: lierolibre-0.4_win32) +Author: Martin Erik Werner +Date: Tue Jun 12 12:05:50 2012 +0200 + + Update win ChangeLog + + ChangeLog.txt | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +commit 8a7d5f6ebbe6a6d6cf88c6e5ff2efedc443ac390 +Merge: 8e3404d 3768ded +Author: Martin Erik Werner +Date: Tue Jun 12 12:05:36 2012 +0200 + + Merge branch 'master' into windows + +commit 8e3404d2d9cdabbf7d2de37f42fdbedb518e3334 +Author: Martin Erik Werner +Date: Tue Jun 12 12:04:30 2012 +0200 + + Update win ChangeLog + + ChangeLog.txt | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 3768ded7a88a7d273a5be2f6fe36b77edcb9f246 (tag: lierolibre-0.4) +Author: Martin Erik Werner +Date: Tue Jun 12 12:04:12 2012 +0200 + + Update ChangeLog + + ChangeLog | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 280931213e3f2142cb32db3418cd98db03c5d4ae +Author: Martin Erik Werner +Date: Tue Jun 12 12:03:54 2012 +0200 + + Set June as release for 0.4 + + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b50f206c338c366cbce16c891a0113669db2a91b +Author: Martin Erik Werner +Date: Tue Jun 12 11:58:14 2012 +0200 + + Update win ChangeLog + + ChangeLog.txt | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +commit 56803e212d690496018f3030d2862df3df7398a0 +Merge: c2714e8 3d31aaa +Author: Martin Erik Werner +Date: Tue Jun 12 11:57:58 2012 +0200 + + Merge branch 'master' into windows + +commit 3d31aaaaac132e9a2d031c81679e34109e3b8fa4 +Author: Martin Erik Werner +Date: Tue Jun 12 11:57:49 2012 +0200 + + Update ChangeLog + + ChangeLog | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 6f48a9776d3151c163a0bbef3eb8c52b0e75bd18 +Author: Martin Erik Werner +Date: Tue Jun 12 11:56:49 2012 +0200 + + data submodule, CFG version 1 + + data | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c2714e8dbd1ddab51cdad53dad982e73442eb633 +Author: Martin Erik Werner +Date: Tue Jun 12 11:44:05 2012 +0200 + + Update win ChangeLog + + ChangeLog.txt | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit f7921d48bc27099eea883e4ba3e96a31904b9de7 +Author: Martin Erik Werner +Date: Tue Jun 12 11:43:31 2012 +0200 + + Crrect name for lierocfg.txt + + assemble-release.bat | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ddcef02dd358d0c7964526031254ab1db4efa541 +Author: Martin Erik Werner +Date: Tue Jun 12 00:59:22 2012 +0200 + + Update win ChangeLog + + ChangeLog.txt | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 45 insertions(+) + +commit 303654042e5f683074a7489ed6769fa9b2d20c61 +Merge: accd144 104b3fe +Author: Martin Erik Werner +Date: Tue Jun 12 00:58:56 2012 +0200 + + Merge branch 'master' into windows + +commit 104b3fe7c1b93e122489e1d8b046329bdbc28bef +Author: Martin Erik Werner +Date: Tue Jun 12 00:58:47 2012 +0200 + + Update ChangeLog + + ChangeLog | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + commit 6ce2817750ab081f420dd7e47a831367f249d52c Author: Martin Erik Werner Date: Tue Jun 12 00:41:08 2012 +0200 @@ -18,6 +1067,22 @@ README_linuxbin | 10 ++++++++++ 1 file changed, 10 insertions(+) +commit accd14473857192250f336380b1019cafbbad7e5 +Author: Martin Erik Werner +Date: Tue Jun 12 00:48:59 2012 +0200 + + Update win ChangeLog + + ChangeLog.txt | 729 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 729 insertions(+) + +commit 0d134f1fda2f107b4f1f280d57181106b1a4573a +Merge: c726392 17ca2ff +Author: Martin Erik Werner +Date: Tue Jun 12 00:48:36 2012 +0200 + + Merge branch 'master' into windows + commit 17ca2ff50810ff24ff1de24b626d547e2f505211 Author: Martin Erik Werner Date: Tue Jun 12 00:48:22 2012 +0200 @@ -55,6 +1120,13 @@ src/Jamfile | 1 + 1 file changed, 1 insertion(+) +commit c726392511f8b7a1711628a420890e0812c9fe80 +Merge: 6a3cd15 f6a7e0c +Author: Martin Erik Werner +Date: Mon Jun 11 23:40:47 2012 +0200 + + Merge branch 'master' into windows + commit f6a7e0c4e8f53a3e7e28eac01a07a4b03bbacfbe Author: Martin Erik Werner Date: Mon Jun 11 22:28:37 2012 +0200 @@ -87,6 +1159,33 @@ Makefile.am | 82 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 39 deletions(-) +commit 6a3cd15bd6b659723b620c3a4fd051637e37c65f +Author: Martin Erik Werner +Date: Mon Jun 11 15:26:06 2012 +0200 + + Note libsrc in win COPYING + + COPYING.txt | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 5680c14ac19c30751b0b4bb890cec97e3408e2b7 +Author: Martin Erik Werner +Date: Mon Jun 11 13:48:58 2012 +0200 + + Rename liero.cfg->lierocfg.txt in release script + + assemble-release.bat | 1 + + 1 file changed, 1 insertion(+) + +commit a8e47c0d32cb5eee336d1570f2d5641e07344e85 +Merge: 522b737 578fdf8 +Author: Martin Erik Werner +Date: Mon Jun 11 13:47:41 2012 +0200 + + Merge branch 'master' into windows + + Don't use win-specific data submodule + commit 578fdf84102efe35eae3344260a98d9e6c5fc188 Author: Martin Erik Werner Date: Mon Jun 11 13:45:29 2012 +0200 @@ -96,6 +1195,22 @@ data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +commit 522b73766ad2c17ada26071f289fad17064042ca +Merge: 005035c 4138c50 +Author: Martin Erik Werner +Date: Mon Jun 11 13:36:18 2012 +0200 + + Merge branch 'master' into windows + +commit 005035cdd7b3d48a9cc2f369bb9637a908c7e380 +Author: Martin Erik Werner +Date: Mon Jun 11 13:29:22 2012 +0200 + + Don't mention man pages in windows release + + README.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + commit 4138c502cfeb9cbed6fbae2e060780419cad9590 Author: Martin Erik Werner Date: Mon Jun 11 13:28:22 2012 +0200 @@ -105,6 +1220,131 @@ NEWS | 5 +++++ 1 file changed, 5 insertions(+) +commit 7e3663c0ed4151eb6fc1f9f002daf2c53621f697 +Author: Martin Erik Werner +Date: Sun Jun 10 23:44:23 2012 +0200 + + rename to txt, add SDL_mixer.dll + + assemble-release.bat | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 41af8e3372d99cccdcd018a0fa9df58b926d4bae +Author: Martin Erik Werner +Date: Sun Jun 10 23:28:08 2012 +0200 + + Workaround lack of sane cli + + assemble-release.bat | 22 +++++++++++++++------- + 1 file changed, 15 insertions(+), 7 deletions(-) + +commit 252924d29a32b33dfc9fece36989744d3e370e2e +Author: Martin Erik Werner +Date: Sun Jun 10 23:27:54 2012 +0200 + + submodule hardcode D and set SDL for nomasm zlib + + lib | 2 +- + src/_build/lierolibre.sln | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit a9e6cf0525593689190f031f48d449a43938807c +Author: Martin Erik Werner +Date: Sun Jun 10 23:14:22 2012 +0200 + + winadapt data submodule + + data | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 35202747aec2ddef8bfd555b95bd0dbd5d7829c9 +Author: Martin Erik Werner +Date: Sun Jun 10 21:27:36 2012 +0200 + + winrelease script for SDL source + + assemble-release.bat | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 6d7afffa1b5aae04eb26f6140ec49b444a0a94fa +Author: Martin Erik Werner +Date: Sun Jun 10 21:24:42 2012 +0200 + + Update projs with SDL source + + lib | 2 +- + src/_build/liero.vcxproj | 7 ++++--- + src/_build/lierolibre.sln | 17 +++++++++++++++++ + 3 files changed, 22 insertions(+), 4 deletions(-) + +commit 9d7bf2d8c7e1ac657a29227608530df8cf2dca56 +Author: Martin Erik Werner +Date: Sun Jun 10 18:37:24 2012 +0200 + + submodule lib SDL include dir + + lib | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c51063a6dd7fbf069ca85cae07f208a3611bdd96 +Author: Martin Erik Werner +Date: Sun Jun 10 18:21:55 2012 +0200 + + lib submodule SDL dir fixes + + lib | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit be4abce226d915cc07449ae39c0769d317b4bcdc +Author: Martin Erik Werner +Date: Sun Jun 10 17:13:13 2012 +0200 + + lib submodule SDL dir move + + lib | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 03bfb7913c69b075f3ea8adab64f944396063d36 +Author: Martin Erik Werner +Date: Sun Jun 10 14:31:16 2012 +0200 + + Extend windows release script + + assemble-release.bat | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 52d411e0bedffb10572f2007ef8b5b951579f842 +Author: Martin Erik Werner +Date: Sun Jun 10 14:30:51 2012 +0200 + + Missing period + + COPYING.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit df5dc6ab306228a7453dd9fc71aaba5f6bb12264 +Author: Martin Erik Werner +Date: Sun Jun 10 14:23:06 2012 +0200 + + lib submodule SDL source + + lib | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b7cd653651114abeeea0ebb875b3c013129e9cb5 +Merge: 3bfe159 58f5b2e +Author: Martin Erik Werner +Date: Sun Jun 10 12:25:22 2012 +0200 + + Merge branch 'windows' of gitorious.org:lierolibre/lierolibre into windows + +commit 3bfe159768a635dc283205759892e21ac7778ccd +Merge: b2a0625 547d93f +Author: Martin Erik Werner +Date: Sun Jun 10 12:22:48 2012 +0200 + + Merge branch 'master' into windows + commit 547d93f0903a7e002d3960073625788e7ef1a663 Author: Martin Erik Werner Date: Sun Jun 10 12:20:47 2012 +0200 @@ -124,6 +1364,42 @@ lgpl-2.1.txt | 502 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 504 insertions(+) +commit b2a06253045c4f99837b28c42e55e13e2883a179 +Author: Martin Erik Werner +Date: Sun Jun 10 12:10:29 2012 +0200 + + Add lgpl plaintext + + COPYING.txt | 2 + + assemble-release.bat | 2 +- + lgpl-2.1.txt | 502 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 505 insertions(+), 1 deletion(-) + +commit 6a797a21ab3fd5882bbf43faab5295051cc04fd0 +Author: Martin Erik Werner +Date: Sun Jun 10 00:27:48 2012 +0200 + + start writing realease-assembly script for win + + assemble-release.bat | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 58f5b2e3b4d1cf886e0b9fbd6f9c64d913ec196b +Merge: 658c1cd cd4c08f +Author: Martin Erik Werner +Date: Sat Jun 9 22:45:28 2012 +0200 + + Merge branch 'windows' of gitorious.org:lierolibre/lierolibre into windows + +commit 658c1cdf38abc723a143d06ded1f82f2e328f472 +Author: Martin Erik Werner +Date: Sat Jun 9 22:43:47 2012 +0200 + + Added msvc dlls to lib + + lib | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 47894a5a9d207db95b94db5a1def58555f668ec8 Author: Martin Erik Werner Date: Sat Jun 9 21:38:19 2012 +0200 @@ -133,6 +1409,13 @@ README_linuxbin | 10 ---------- 1 file changed, 10 deletions(-) +commit cd4c08fb8f82a915f65a6f0199eced97ce266083 +Merge: 1ec6876 a657855 +Author: Martin Erik Werner +Date: Wed Jun 6 23:25:01 2012 +0200 + + Merge branch 'master' into windows + commit a657855ded908074c17c0cc37e5e919f93576cef Author: Martin Erik Werner Date: Wed Jun 6 20:01:41 2012 +0200 @@ -258,6 +1541,20 @@ configure.ac | 11 +++++++ 2 files changed, 109 insertions(+), 5 deletions(-) +commit 1ec687600688287207a7d63b7adfb93533b9ec7e +Merge: e85b0d5 4e27e1f +Author: Martin Erik Werner +Date: Mon Jun 4 23:03:48 2012 +0200 + + Merge branch 'windows' of gitorious.org:lierolibre/lierolibre into windows + +commit 4e27e1f9b6d8ce2e40cbc72f493b806a12c35471 +Merge: 9327c2a d050c99 +Author: Martin Erik Werner +Date: Mon Jun 4 23:03:52 2012 +0200 + + Merge branch 'master' into windows + commit d050c99278c3c45bb12c94ca66cce9622debafa9 Author: Martin Erik Werner Date: Mon Jun 4 23:02:48 2012 +0200 @@ -267,6 +1564,22 @@ src/filesystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +commit e85b0d55086529ffbdf24e1123650762551413a6 +Author: Martin Erik Werner +Date: Mon Jun 4 22:42:13 2012 +0200 + + include configCompat.cpp in vcproj + + src/_build/liero.vcxproj | 1 + + 1 file changed, 1 insertion(+) + +commit 9327c2a446ad385ae487120b2f8495c65b8a4f1a +Merge: a22bd39 3c51509 +Author: Martin Erik Werner +Date: Mon Jun 4 22:41:08 2012 +0200 + + Merge branch 'master' into windows + commit 3c51509cce2f73418743a7520a96b430dde85198 Author: Martin Erik Werner Date: Mon Jun 4 22:40:53 2012 +0200 @@ -276,6 +1589,13 @@ src/common.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +commit a22bd3974b598fa3446de6fafca9dd370b9e9555 +Merge: 12f00a1 d2b59b5 +Author: Martin Erik Werner +Date: Mon Jun 4 22:19:37 2012 +0200 + + Merge branch 'master' into windows + commit d2b59b515e89a56622d9af24f2c3076b8a6548bd Author: Martin Erik Werner Date: Mon Jun 4 22:18:07 2012 +0200 @@ -294,6 +1614,13 @@ src/filesystem.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) +commit 12f00a16f461671839afe35e352a96dff84fed71 +Merge: 9546fe7 525b851 +Author: Martin Erik Werner +Date: Mon Jun 4 20:09:14 2012 +0200 + + Merge branch 'master' into windows + commit 525b851f614eb9fd51434355391738cc4cbdaaca Author: Martin Erik Werner Date: Mon Jun 4 20:08:22 2012 +0200 @@ -303,6 +1630,13 @@ README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +commit 9546fe767c896c2ba5bf70e0fa534e05d29fc361 +Merge: e645f31 5ca6a5c +Author: Martin Erik Werner +Date: Mon Jun 4 19:34:17 2012 +0200 + + Merge branch 'master' into windows + commit 5ca6a5cf30153d32e6b776a05a57a1369b70cc6e Author: Martin Erik Werner Date: Fri May 18 13:27:51 2012 +0200 @@ -312,6 +1646,13 @@ NEWS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) +commit e645f3139dd8af49dc8c5319b88e61c7acda4bff +Merge: d577bfc f54a15e +Author: Martin Erik Werner +Date: Fri May 18 13:13:48 2012 +0200 + + Merge branch 'master' into windows + commit f54a15ed6f79d11028b9b9de19aec24bc6efcdcc Author: Martin Erik Werner Date: Fri May 18 13:12:09 2012 +0200 @@ -366,6 +1707,13 @@ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) +commit d577bfc48e3f14b28cb386efdccc6ddcd37c5d4a +Merge: a819614 36a08d6 +Author: Martin Erik Werner +Date: Thu May 17 11:50:37 2012 +0200 + + Merge branch 'master' into windows + commit 36a08d6ac07fd80ddd4d0adb3788c1df11c3341f Author: Martin Erik Werner Date: Mon May 14 20:49:47 2012 +0200 @@ -439,7 +1787,32 @@ README | 2 ++ 1 file changed, 2 insertions(+) -commit 16df031dfe180dad3318b78abaa99347284651ee +commit a819614fa6e3a19a9d93e74dcf097125390c13ca +Author: Martin Erik Werner +Date: Wed May 9 01:26:16 2012 +0200 + + Note where to place lev files in README + + README.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit cf1728bb2e7efb36dad629d87c428f2b86b8d174 (tag: lierolibre-0.3_win32) +Author: Martin Erik Werner +Date: Thu May 3 12:22:39 2012 +0200 + + Update windows changelog + + ChangeLog.txt | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 131 insertions(+) + +commit c56e0f370704e60455c69e78de666ca4c3ffa6a3 +Merge: 3039d30 16df031 +Author: Martin Erik Werner +Date: Thu May 3 12:21:26 2012 +0200 + + Merge branch 'master' into windows + +commit 16df031dfe180dad3318b78abaa99347284651ee (tag: lierolibre-0.3) Author: Martin Erik Werner Date: Thu May 3 12:21:14 2012 +0200 @@ -522,6 +1895,13 @@ COPYING | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) +commit 3039d30c9c3e28f9dc7238fb2e1be7a19648678b +Merge: 2d13bc3 9046aab +Author: Martin Erik Werner +Date: Wed May 2 17:31:08 2012 +0200 + + Merge branch 'master' into windows + commit 9046aab7731f6fb9fd5043b2396b65bbcd82c399 Author: Martin Erik Werner Date: Wed May 2 17:17:08 2012 +0200 @@ -536,6 +1916,69 @@ src/_build/lierolibre.sln | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) +commit 2d13bc3a050f13a2464f4846da2347fd315ca825 +Author: Martin Erik Werner +Date: Wed May 2 17:17:08 2012 +0200 + + Fixes for the no-masm building (boost path & arch) + + lib | 2 +- + src/_build/liero.vcxproj | 4 ++-- + src/_build/lierolibre.sln | 6 ++++-- + 3 files changed, 7 insertions(+), 5 deletions(-) + +commit 087eb6b8b4eef89573a0638f082b9899786a22dc +Author: Martin Erik Werner +Date: Wed May 2 16:52:14 2012 +0200 + + Update windows changelog + + ChangeLog.txt | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +commit e1bf459bb4d9bdde7413e58c48c2c16a911050a1 +Author: Martin Erik Werner +Date: Wed May 2 16:38:22 2012 +0200 + + update lib module with zlib no-masm /MD + + lib | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a564e1e9c466e9ea2c256abed861df8ae6eee22d +Author: Martin Erik Werner +Date: Wed May 2 16:17:04 2012 +0200 + + fix lierocfg.txt path and name in windows README + + README.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8c63640b224b910be2d7ccd78f29b3793cb9f8c5 +Author: Martin Erik Werner +Date: Wed May 2 16:02:08 2012 +0200 + + Update windows changelog + + ChangeLog.txt | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 78 insertions(+) + +commit 42cfcb06652aa2a63acc827caa2885aea9cadd1f +Merge: 50eee55 6e78a5f +Author: Martin Erik Werner +Date: Wed May 2 15:38:50 2012 +0200 + + Merge branch 'master' into windows + +commit 50eee556c5f07de7421336bd747bc315d63ae705 +Author: Martin Erik Werner +Date: Wed May 2 14:42:51 2012 +0200 + + Update COPYING with static zlib and licenses for NEWS + + COPYING.txt | 26 +++++++++++++++++--------- + 1 file changed, 17 insertions(+), 9 deletions(-) + commit 6e78a5fab6d6a96fe290a20a1cc898177e70f86d Author: Martin Erik Werner Date: Wed May 2 15:28:50 2012 +0200 @@ -545,6 +1988,22 @@ COPYING | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 90 insertions(+), 16 deletions(-) +commit 0e4dd8cec4fcee432c2d24fc675d4101e576c0fc +Author: Martin Erik Werner +Date: Wed May 2 05:11:03 2012 +0200 + + undefining ZLIB_WINAPI and tweaking zlib in lib submodule + + lib | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2dd0a46c8577c58369bae1523591fc22187df1fe +Merge: 80a9a0e 66618db +Author: Martin Erik Werner +Date: Wed May 2 05:10:02 2012 +0200 + + Merge branch 'master' into windows + commit 66618db7fe11c66e4eb3ad349c559c6c89f9a461 Author: Martin Erik Werner Date: Wed May 2 05:06:19 2012 +0200 @@ -564,6 +2023,49 @@ src/gvl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +commit 80a9a0eb76ff8e7fb9293fdf5ea504db90379e4c +Author: Martin Erik Werner +Date: Wed May 2 04:57:55 2012 +0200 + + static zlib linking in gvl + + src/gvl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e7d78f58b2ac1b749a8ccf3cc9ac361a35428991 +Author: Martin Erik Werner +Date: Wed May 2 00:23:13 2012 +0200 + + Update windows changelog + + ChangeLog.txt | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit b47b99a71b87ac49525ef9dd840b72ea2744d8f0 +Author: Martin Erik Werner +Date: Wed May 2 00:19:13 2012 +0200 + + Remove leftover check-marker + + COPYING.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d29f2436db04e8c53e48fdbf55583a2be2a9c818 +Author: Martin Erik Werner +Date: Wed May 2 00:06:58 2012 +0200 + + Update windows changelog + + ChangeLog.txt | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit df1708ee4a4755cfc5603d0ec5aab48a73ef6dba +Merge: 0b717aa e99af1e +Author: Martin Erik Werner +Date: Wed May 2 00:05:50 2012 +0200 + + Merge branch 'master' into windows + commit e99af1ea5c41a1c1107b3764ceb423de3585abf6 Author: Martin Erik Werner Date: Wed May 2 00:05:35 2012 +0200 @@ -573,6 +2075,32 @@ src/reader.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) +commit 0b717aa4e2209b9a2b516535c95f1e1746ae64c9 +Author: Martin Erik Werner +Date: Tue May 1 23:47:18 2012 +0200 + + Separate ChangeLog for the windows branch, though + + ChangeLog.txt | 5612 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 5612 insertions(+) + +commit 37b2e921522275d2dfb690c785e6a0a28f18fd92 +Author: Martin Erik Werner +Date: Tue May 1 23:46:18 2012 +0200 + + On second though since they won't diverge lets not clone + + AUTHORS.txt | 11 -- + NEWS.txt | 376 ----------------------------------------------------------- + 2 files changed, 387 deletions(-) + +commit 75c3bd3eb538cc17fb93e03f061c8cf07090b41b +Merge: 591c2d0 b6508be +Author: Martin Erik Werner +Date: Tue May 1 23:44:14 2012 +0200 + + Merge branch 'master' into windows + commit b6508be52524223ea2944a458ad67183d60860e6 Author: Martin Erik Werner Date: Tue May 1 23:43:18 2012 +0200 @@ -583,6 +2111,23 @@ configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) +commit 591c2d08f2052c1d87c816a91115b157db46e8b2 +Author: Martin Erik Werner +Date: Tue May 1 23:38:51 2012 +0200 + + Added windowsy NEWS and AUTHORS (.txt) + + AUTHORS.txt | 11 ++ + NEWS.txt | 376 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 387 insertions(+) + +commit 865b1b18e458d9852968ac04dae9efd6eb6d4188 +Merge: c0df4a3 4c31e6d +Author: Martin Erik Werner +Date: Tue May 1 23:30:08 2012 +0200 + + Merge branch 'master' into windows + commit 4c31e6d621d2958fe5ec803e9b6be5b85288cc09 Author: Martin Erik Werner Date: Tue May 1 23:29:21 2012 +0200 @@ -595,6 +2140,31 @@ src/reader.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) +commit c0df4a347c59c8f40e982601fe412fd866413b39 +Merge: e7ec3ad 60481dd +Author: Martin Erik Werner +Date: Tue May 1 23:01:07 2012 +0200 + + Merge branch 'master' into windows + +commit e7ec3ad41bc935561b5353c22cff52e22dae16ea +Author: Martin Erik Werner +Date: Tue May 1 22:13:22 2012 +0200 + + batch script for cmd in workdir + + scripts/lierolibre-cmd.bat | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 858b4dca27ab1d445df9db3a50acb9e110e5aee6 +Author: Martin Erik Werner +Date: Tue May 1 22:00:35 2012 +0200 + + windows-specific README + + README.txt | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 57 insertions(+) + commit 60481dd99ffa30ff36ede2b58bf933ebe03d3193 Author: Martin Erik Werner Date: Tue May 1 15:44:27 2012 +0200 @@ -683,6 +2253,15 @@ src/math.hpp | 2 -- 11 files changed, 141 deletions(-) +commit bc6d5de62f36400ba41db4b9a86aff8a419d53dc +Author: Martin Erik Werner +Date: Tue May 1 13:02:38 2012 +0200 + + copyright info for windows binary distribution + + COPYING.txt | 188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 188 insertions(+) + commit 137aaa180ce23869718bec306e055a10218e4176 Author: Martin Erik Werner Date: Tue May 1 04:01:07 2012 +0200 @@ -692,6 +2271,16 @@ NEWS | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) +commit 21a057ba6466d0e7c6dbcae4fd64b7cd2aadeb35 +Author: Martin Erik Werner +Date: Tue May 1 03:01:19 2012 +0200 + + Added w32 lib depends as submodule + + .gitmodules | 3 +++ + lib | 1 + + 2 files changed, 4 insertions(+) + commit d5421dee7c8497b68751ef67ab1215a11261d35c Author: Martin Erik Werner Date: Tue May 1 02:58:51 2012 +0200 @@ -834,7 +2423,7 @@ src/gfx.cpp | 3 +++ 1 file changed, 3 insertions(+) -commit bd6d35fe46b3c719798d49e26908c045ec0361d3 +commit bd6d35fe46b3c719798d49e26908c045ec0361d3 (tag: lierolibre-0.2) Author: Martin Erik Werner Date: Fri Apr 27 18:36:35 2012 +0200 @@ -2295,7 +3884,7 @@ main.cpp | 54 +++++++++++++++++------------------------------------- 4 files changed, 56 insertions(+), 38 deletions(-) -commit 917fe385ac41af2f08080706a3b54206a6afb573 +commit 917fe385ac41af2f08080706a3b54206a6afb573 (tag: lierolibre-0.1) Author: Martin Erik Werner Date: Mon Apr 23 16:44:51 2012 +0200 @@ -2658,7 +4247,7 @@ Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -commit 1cc23a186dc371814b9dee38eb40a980cd372268 +commit 1cc23a186dc371814b9dee38eb40a980cd372268 (autotools) Author: Martin Erik Werner Date: Sun Apr 22 03:18:28 2012 +0200 @@ -4511,7 +6100,7 @@ gvl | 1 + 2 files changed, 4 insertions(+) -commit 744890aab61d4f50c8bfd30a1adee70fc95f5f49 +commit 744890aab61d4f50c8bfd30a1adee70fc95f5f49 (bridge/master) Author: Martin Erik Werner Date: Sun Apr 1 21:12:09 2012 +0200 diff -Nru lierolibre-0.4/Makefile.am lierolibre-0.5/Makefile.am --- lierolibre-0.4/Makefile.am 2012-06-11 21:40:47.000000000 +0000 +++ lierolibre-0.5/Makefile.am 2012-11-15 20:55:26.000000000 +0000 @@ -12,11 +12,11 @@ pkglibexec_PROGRAMS = lierolibre # It seems it only includes src/../ by default -lierolibre_CPPFLAGS = $(GVL_CPPFLAGS) $(SDL_CPPFLAGS) -I$(srcdir)/src +lierolibre_CPPFLAGS = $(LIBCONFIGXX_CPPFLAGS) $(GVL_CPPFLAGS) $(SDL_CPPFLAGS) -I$(srcdir)/src $(WINDOWS_CPPFLAGS) lierolibre_CFLAGS = $(LIBCONFIGXX_CFLAGS) $(SDL_MIXER_CFLAGS) $(SDL_CFLAGS) $(RELPATH_CFLAGS) lierolibre_CXXFLAGS = $(SDL_CXXFLAGS) $(RELPATH_CFLAGS) lierolibre_LDADD = src/gvl/libgvl.la $(LIBCONFIGXX_LIBS) $(SDL_MIXER_LIBS) $(SDL_LIBS) $(BOOST_PO_LIBS) -lierolibre_LDFLAGS = $(RELPATH_LDFLAGS) +lierolibre_LDFLAGS = $(RELPATH_LDFLAGS) $(WINDOWS_LDFLAGS) noinst_LTLIBRARIES = src/gvl/libgvl.la src_gvl_libgvl_la_CFLAGS = $(ZLIB_CFLAGS) $(RELPATH_CFLAGS) @@ -41,10 +41,11 @@ dist_noinst_SCRIPTS = \ autogen.sh \ + scripts/cross-compile \ + scripts/lierolibre.am \ src/Jamfile \ src/dummy_config.h \ - src/gvl/Jamfile \ - scripts/lierolibre.am + src/gvl/Jamfile nodist_man6_MANS = \ man/lierolibre.6 \ @@ -61,11 +62,8 @@ dist_doc_DATA = \ AUTHORS \ ChangeLog \ - COPYING \ NEWS \ - README \ - data/LIERO.TXT \ - data/LIEROENG.TXT + README dist_desktop_DATA = \ data/lierolibre.desktop @@ -74,15 +72,13 @@ data/lierolibre.svg dist_pkgdata_DATA = \ + data/LIERO.CHR \ data/LIERO.DAT \ data/LIERO.OPT \ + data/LIERO.SND \ data/NAMES.DAT \ data/liero.cfg -nodist_pkgdata_DATA = \ - data/LIERO.CHR \ - data/LIERO.SND - MANPAGES_SOURCES = \ man/lierolibre.6.am \ man/lierolibre-extractgfx.6.am \ @@ -129,21 +125,34 @@ data/sounds/SHOTGUN.wav \ data/sounds/THROW.wav +WINDOWS_SOURCES = \ + scripts/lierolibre-cmd.bat \ + src/gvl/_build/Gvl_C++0x.props \ + src/gvl/_build/Gvl_IEEE_SEE2.props \ + src/gvl/_build/Gvl_Standard_Config.props \ + src/gvl/_build/gvl.vcproj \ + src/gvl/_build/gvl.vcxproj \ + src/gvl/_build/gvl.vcxproj.filters \ + windows/visualC/liero.vcproj \ + windows/visualC/liero.vcxproj \ + windows/visualC/lierolibre.sln + dist_noinst_DATA = \ + $(GRAPHICS_SOURCES) \ $(MANPAGES_SOURCES) \ - \ - \ + $(SOUND_SOURCES) \ + $(WINDOWS_SOURCES) \ + COPYING \ + COPYING_winbin \ + README.txt \ + README_linuxbin \ data/FILE_ID.DIZ \ data/LICENSE.TXT \ - \ - \ + data/LIERO.TXT \ + data/LIEROENG.TXT \ data/lierolibre.xpm \ - \ - \ - $(GRAPHICS_SOURCES) \ - \ - \ - $(SOUND_SOURCES) + data/sounds/sounds.txt \ + lgpl-2.1.txt lierolibre_SOURCES = \ src/binReader.cpp \ @@ -572,14 +581,17 @@ src/gvl/tut/quickcheck/context.hpp \ src/gvl/tut/quickcheck/generator.hpp \ src/gvl/tut/quickcheck/property.hpp \ - src/gvl/tut/quickcheck/quickcheck.hpp + src/gvl/tut/quickcheck/quickcheck.hpp \ + \ + src/boostTesting.cpp LIB_ARCH_NIXBIN_LIBFILES = \ - lib/libz.so.1 \ + lib/libcap.so.2 \ lib/libdbus-1.so.3 \ + lib/libtinfo.so.5 \ lib/libwrap.so.0 \ - lib/libtinfo.so.5 + lib/libz.so.1 USR_LIB_ARCH_NIXBIN_LIBFILES = \ lib/libconfig++.so \ @@ -597,6 +609,7 @@ lib/libcaca.so.0 \ lib/libsndfile.so.1 \ lib/libasyncns.so.0 \ + lib/libogg.so.0 \ lib/libvorbisenc.so.2 \ lib/libxcb.so.1 \ lib/libX11-xcb.so.1 \ @@ -604,12 +617,8 @@ USR_LIB_NIXBIN_LIBFILES = \ lib/libboost_program_options.so \ - lib/libogg.so.0 \ lib/libmad.so.0 -LIB_NIXBIN_LIBFILES = \ - lib/libcap.so.2 - USR_LIB_ARCH_PA_NIXBIN_LIBFILES = \ lib/libpulsecommon-2.0.so @@ -649,7 +658,79 @@ libxcb1 \ zlib1g -.PHONY: clean-local dist-nixbin-dir dist-nixbin-libsrc dist-nixbin dist-nixbin-xz +WINDOWS_LIBS_A = \ + windows/libconfig-1.4.8/lib/.libs/libconfig++.a + +WINDOWS_LIBS_DLL = \ + windows/SDL-1.2.15/build/.libs/SDL.dll \ + windows/SDL_mixer-1.2.12/lib/x86/SDL_mixer.dll \ + windows/boost-program_options-1.51.0/stage/lib/libboost_program_options.dll \ + windows/zlib-1.2.7/zlib1.dll + +WINDOWS_LIBS = $(WINDOWS_LIBS_A) $(WINDOWS_LIBS_DLL) + +WINDOWS_TXT = AUTHORS COPYING ChangeLog NEWS + +if HAS_WINDOWS_LDFLAGS +EXTRA_lierolibre_DEPENDENCIES = $(WINDOWS_LIBS) +endif + +windows/boost-program_options-1.51.0/stage/lib/libboost_program_options.dll: + cd windows/boost-program_options-1.51.0/ ;\ + ./bootstrap.sh ;\ + rm -rf stage ;\ + rm -rf bin.v2 ;\ + ./b2 --user-config=tools/build/v2/user-config_i686-w64-mingw32-gcc.jam toolset=gcc-mingw32 target-os=windows variant=release link=shared -sNO_BZIP2=1 -sNO_ZLIB=1 linkflags='-static-libgcc -static-libstdc++' stage/lib/libboost_program_options.dll stage/lib/libboost_program_options.dll.a + +windows/zlib-1.2.7/zlib1.dll: + cd windows/zlib-1.2.7/ && \ + make -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- + +windows/SDL-1.2.15/build/.libs/SDL.dll: + cd windows/SDL-1.2.15/ && \ + ./configure --host=i686-w64-mingw32 && \ + make LDFLAGS='-static-libgcc -static-libstdc++' + +windows/libconfig-1.4.8/lib/.libs/libconfig++.a: + cd windows/libconfig-1.4.8/ && \ + ./configure --host=i686-w64-mingw32 && \ + make LDFLAGS='-static-libgcc -static-libstdc++' + +if HAS_WINDOWS_LDFLAGS +dist-hook: lierolibre.exe $(WINDOWS_LIBS) + for i in $(WINDOWS_LIBS_DLL) .libs/lierolibre.exe; do \ + $(STRIP) $$i -o $(distdir)/$$(basename $$i); \ + chmod +x $(distdir)/$$(basename $$i); done + cp scripts/lierolibre-cmd.bat $(distdir) + cp $(distdir)/data/liero.cfg $(distdir)/data/lierocfg.txt + for i in $(WINDOWS_TXT); do \ + cp $(distdir)/$$i $(distdir)/$$i.txt; \ + sed 's/$$/ /' -i $(distdir)/$$i.txt; done + mkdir $(distdir)/user + mkdir $(distdir)/libsrc + cp -r windows/SDL-1.2.15/ $(distdir)/libsrc/ + cp -r windows/libconfig-1.4.8/ $(distdir)/libsrc/ + -make -C $(distdir)/libsrc/SDL-1.2.15/ distclean + -make -C $(distdir)/libsrc/libconfig-1.4.8/ distclean + sed '/no longer applies./r COPYING_winbin' -i $(distdir)/COPYING.txt + sed \ + -e '/START_MACHINE_READABLE/,/END_MACHINE_READABLE/d' \ + -e '/.*_HUMAN_READABLE/d' \ + -i $(distdir)/COPYING.txt + sed '/ separate licenses, and not covered under the BSD-2-Clause license/r COPYING_winbin' -i $(distdir)/COPYING.txt + sed \ + -e '/START_HUMAN_READABLE/,/END_HUMAN_READABLE/d' \ + -e '/.*_MACHINE_READABLE/d' \ + -i $(distdir)/COPYING.txt +else +dist-hook: +endif + cp $(distdir)/src/gvl/_build/Gvl_C++0x.props \ + "$(distdir)/src/gvl/_build/Gvl C++0x.props" + cp $(distdir)/src/gvl/_build/Gvl_IEEE_SEE2.props \ + "$(distdir)/src/gvl/_build/Gvl IEEE SEE2.props" + cp $(distdir)/src/gvl/_build/Gvl_Standard_Config.props \ + "$(distdir)/src/gvl/_build/Gvl Standard Config.props" $(nodist_bin_SCRIPTS): scripts/lierolibre.am install -d scripts/ @@ -685,9 +766,10 @@ $(srcdir)/data/sounds/ \ $@ +.PHONY: clean-local dist-nixbin-dir dist-nixbin-libcopyright dist-nixbin-libsrc dist-nixbin dist-nixbin-xz + clean-local: rm -f \ - $(nodist_pkgdata_DATA) \ $(nodist_bin_SCRIPTS) \ $(nodist_man6_MANS) \ $(MANS_TXT) @@ -745,20 +827,21 @@ dist-nixbin-libsrc: install -d libsrc/ cd libsrc/ && \ - for i in $(NIXBIN_LIB_DEBS); do \ - apt-get source --download-only $$i=$$(dpkg -s $$i | sed -n 's/^Version:\ \(.*\)/\1/p') || \ - touch 00MISSING_$$i.debsource; done + LANG=C apt-get source --download-only \ + $$(for i in $(NIXBIN_LIB_DEBS); do \ + echo $$i=$$(dpkg -s $$i | \ + sed -n 's/^Version:\ \(.*\)/\1/p'); done) 2>&1 >/dev/null | \ + sed -n 's/E: Unable to find a source package for \(.*\)/\1/p' | \ + xargs -I '{}' touch 00MISSING_'{}'.debsource -dist-nixbin-dir: distdir $(pkglibexec_PROGRAMS) $(NIXBIN_LIBFILES) $(nodist_pkgdata_DATA) \ +dist-nixbin-dir: distdir $(pkglibexec_PROGRAMS) $(NIXBIN_LIBFILES) \ $(MANS_TXT) dist-nixbin-libcopyright dist-nixbin-libsrc cp -aT $(PACKAGE_DIRNAME) $(NIXBIN_DIRNAME) cp -a lib/ $(NIXBIN_DIRNAME) cp -a libsrc/ $(NIXBIN_DIRNAME) cp -a $(pkglibexec_PROGRAMS) $(NIXBIN_DIRNAME) - cp -a $(nodist_pkgdata_DATA) $(NIXBIN_DIRNAME)/data/ cp -a $(nodist_man6_MANS) $(NIXBIN_DIRNAME)/man/ cp -a $(MANS_TXT) $(NIXBIN_DIRNAME)/man/ - cp -a README_linuxbin $(NIXBIN_DIRNAME) dist-nixbin: dist-nixbin-dir tar caf $(NIXBIN_DIRNAME).tar.gz $(NIXBIN_DIRNAME) diff -Nru lierolibre-0.4/Makefile.in lierolibre-0.5/Makefile.in --- lierolibre-0.4/Makefile.in 2012-06-11 22:59:54.000000000 +0000 +++ lierolibre-0.5/Makefile.in 2012-11-15 21:03:12.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,6 +19,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,8 +72,7 @@ $(top_srcdir)/src/m4/ltoptions.m4 \ $(top_srcdir)/src/m4/ltsugar.m4 \ $(top_srcdir)/src/m4/ltversion.m4 \ - $(top_srcdir)/src/m4/lt~obsolete.m4 \ - $(top_srcdir)/src/m4/sdl.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/src/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -87,8 +103,7 @@ am__installdirs = "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man6dir)" \ "$(DESTDIR)$(appicondir)" "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgdatadir)" \ - "$(DESTDIR)$(pkgdatadir)" + "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgdatadir)" PROGRAMS = $(pkglibexec_PROGRAMS) am_lierolibre_OBJECTS = src/lierolibre-binReader.$(OBJEXT) \ src/lierolibre-bobject.$(OBJEXT) \ @@ -207,12 +222,16 @@ $(src_gvl_gvltest_SOURCES) DIST_SOURCES = $(src_gvl_libgvl_la_SOURCES) $(lierolibre_SOURCES) \ $(src_gvl_gvltest_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man6dir = $(mandir)/man6 NROFF = nroff MANS = $(nodist_man6_MANS) DATA = $(dist_appicon_DATA) $(dist_desktop_DATA) $(dist_doc_DATA) \ - $(dist_noinst_DATA) $(dist_pkgdata_DATA) \ - $(nodist_pkgdata_DATA) + $(dist_noinst_DATA) $(dist_pkgdata_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -272,6 +291,7 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBCONFIGXX_CFLAGS = @LIBCONFIGXX_CFLAGS@ +LIBCONFIGXX_CPPFLAGS = @LIBCONFIGXX_CPPFLAGS@ LIBCONFIGXX_LIBS = @LIBCONFIGXX_LIBS@ LIBOBJS = @LIBOBJS@ LIBRT = @LIBRT@ @@ -313,6 +333,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +WINDOWS_CPPFLAGS = @WINDOWS_CPPFLAGS@ +WINDOWS_LDFLAGS = @WINDOWS_LDFLAGS@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ abs_builddir = @abs_builddir@ @@ -379,11 +401,11 @@ PACKAGE_DIRNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) NIXBIN_DIRNAME = $(PACKAGE_DIRNAME)_linux-$(build_cpu) # It seems it only includes src/../ by default -lierolibre_CPPFLAGS = $(GVL_CPPFLAGS) $(SDL_CPPFLAGS) -I$(srcdir)/src +lierolibre_CPPFLAGS = $(LIBCONFIGXX_CPPFLAGS) $(GVL_CPPFLAGS) $(SDL_CPPFLAGS) -I$(srcdir)/src $(WINDOWS_CPPFLAGS) lierolibre_CFLAGS = $(LIBCONFIGXX_CFLAGS) $(SDL_MIXER_CFLAGS) $(SDL_CFLAGS) $(RELPATH_CFLAGS) lierolibre_CXXFLAGS = $(SDL_CXXFLAGS) $(RELPATH_CFLAGS) lierolibre_LDADD = src/gvl/libgvl.la $(LIBCONFIGXX_LIBS) $(SDL_MIXER_LIBS) $(SDL_LIBS) $(BOOST_PO_LIBS) -lierolibre_LDFLAGS = $(RELPATH_LDFLAGS) +lierolibre_LDFLAGS = $(RELPATH_LDFLAGS) $(WINDOWS_LDFLAGS) noinst_LTLIBRARIES = src/gvl/libgvl.la src_gvl_libgvl_la_CFLAGS = $(ZLIB_CFLAGS) $(RELPATH_CFLAGS) src_gvl_libgvl_la_LIBADD = $(ZLIB_LIBS) @@ -404,10 +426,11 @@ dist_noinst_SCRIPTS = \ autogen.sh \ + scripts/cross-compile \ + scripts/lierolibre.am \ src/Jamfile \ src/dummy_config.h \ - src/gvl/Jamfile \ - scripts/lierolibre.am + src/gvl/Jamfile nodist_man6_MANS = \ man/lierolibre.6 \ @@ -424,11 +447,8 @@ dist_doc_DATA = \ AUTHORS \ ChangeLog \ - COPYING \ NEWS \ - README \ - data/LIERO.TXT \ - data/LIEROENG.TXT + README dist_desktop_DATA = \ data/lierolibre.desktop @@ -437,15 +457,13 @@ data/lierolibre.svg dist_pkgdata_DATA = \ + data/LIERO.CHR \ data/LIERO.DAT \ data/LIERO.OPT \ + data/LIERO.SND \ data/NAMES.DAT \ data/liero.cfg -nodist_pkgdata_DATA = \ - data/LIERO.CHR \ - data/LIERO.SND - MANPAGES_SOURCES = \ man/lierolibre.6.am \ man/lierolibre-extractgfx.6.am \ @@ -492,21 +510,34 @@ data/sounds/SHOTGUN.wav \ data/sounds/THROW.wav +WINDOWS_SOURCES = \ + scripts/lierolibre-cmd.bat \ + src/gvl/_build/Gvl_C++0x.props \ + src/gvl/_build/Gvl_IEEE_SEE2.props \ + src/gvl/_build/Gvl_Standard_Config.props \ + src/gvl/_build/gvl.vcproj \ + src/gvl/_build/gvl.vcxproj \ + src/gvl/_build/gvl.vcxproj.filters \ + windows/visualC/liero.vcproj \ + windows/visualC/liero.vcxproj \ + windows/visualC/lierolibre.sln + dist_noinst_DATA = \ + $(GRAPHICS_SOURCES) \ $(MANPAGES_SOURCES) \ - \ - \ + $(SOUND_SOURCES) \ + $(WINDOWS_SOURCES) \ + COPYING \ + COPYING_winbin \ + README.txt \ + README_linuxbin \ data/FILE_ID.DIZ \ data/LICENSE.TXT \ - \ - \ + data/LIERO.TXT \ + data/LIEROENG.TXT \ data/lierolibre.xpm \ - \ - \ - $(GRAPHICS_SOURCES) \ - \ - \ - $(SOUND_SOURCES) + data/sounds/sounds.txt \ + lgpl-2.1.txt lierolibre_SOURCES = \ src/binReader.cpp \ @@ -908,13 +939,16 @@ src/gvl/tut/quickcheck/context.hpp \ src/gvl/tut/quickcheck/generator.hpp \ src/gvl/tut/quickcheck/property.hpp \ - src/gvl/tut/quickcheck/quickcheck.hpp + src/gvl/tut/quickcheck/quickcheck.hpp \ + \ + src/boostTesting.cpp LIB_ARCH_NIXBIN_LIBFILES = \ - lib/libz.so.1 \ + lib/libcap.so.2 \ lib/libdbus-1.so.3 \ + lib/libtinfo.so.5 \ lib/libwrap.so.0 \ - lib/libtinfo.so.5 + lib/libz.so.1 USR_LIB_ARCH_NIXBIN_LIBFILES = \ lib/libconfig++.so \ @@ -932,6 +966,7 @@ lib/libcaca.so.0 \ lib/libsndfile.so.1 \ lib/libasyncns.so.0 \ + lib/libogg.so.0 \ lib/libvorbisenc.so.2 \ lib/libxcb.so.1 \ lib/libX11-xcb.so.1 \ @@ -939,12 +974,8 @@ USR_LIB_NIXBIN_LIBFILES = \ lib/libboost_program_options.so \ - lib/libogg.so.0 \ lib/libmad.so.0 -LIB_NIXBIN_LIBFILES = \ - lib/libcap.so.2 - USR_LIB_ARCH_PA_NIXBIN_LIBFILES = \ lib/libpulsecommon-2.0.so @@ -979,6 +1010,18 @@ libvorbis0a \ libvorbisenc2 +WINDOWS_LIBS_A = \ + windows/libconfig-1.4.8/lib/.libs/libconfig++.a + +WINDOWS_LIBS_DLL = \ + windows/SDL-1.2.15/build/.libs/SDL.dll \ + windows/SDL_mixer-1.2.12/lib/x86/SDL_mixer.dll \ + windows/boost-program_options-1.51.0/stage/lib/libboost_program_options.dll \ + windows/zlib-1.2.7/zlib1.dll + +WINDOWS_LIBS = $(WINDOWS_LIBS_A) $(WINDOWS_LIBS_DLL) +WINDOWS_TXT = AUTHORS COPYING ChangeLog NEWS +@HAS_WINDOWS_LDFLAGS_TRUE@EXTRA_lierolibre_DEPENDENCIES = $(WINDOWS_LIBS) all: all-am .SUFFIXES: @@ -1141,8 +1184,11 @@ $(src_gvl_libgvl_la_LINK) $(src_gvl_libgvl_la_OBJECTS) $(src_gvl_libgvl_la_LIBADD) $(LIBS) install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -1368,8 +1414,11 @@ $(src_gvl_gvltest_LINK) $(src_gvl_gvltest_OBJECTS) $(src_gvl_gvltest_LDADD) $(LIBS) install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -1400,8 +1449,11 @@ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -2374,9 +2426,18 @@ -rm -f libtool config.lt install-man6: $(nodist_man6_MANS) @$(NORMAL_INSTALL) - test -z "$(man6dir)" || $(MKDIR_P) "$(DESTDIR)$(man6dir)" - @list='$(nodist_man6_MANS)'; test -n "$(man6dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ + @list1='$(nodist_man6_MANS)'; \ + list2=''; \ + test -n "$(man6dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man6dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man6dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.6[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -2406,8 +2467,11 @@ dir='$(DESTDIR)$(man6dir)'; $(am__uninstall_files_from_dir) install-dist_appiconDATA: $(dist_appicon_DATA) @$(NORMAL_INSTALL) - test -z "$(appicondir)" || $(MKDIR_P) "$(DESTDIR)$(appicondir)" @list='$(dist_appicon_DATA)'; test -n "$(appicondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appicondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appicondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -2424,8 +2488,11 @@ dir='$(DESTDIR)$(appicondir)'; $(am__uninstall_files_from_dir) install-dist_desktopDATA: $(dist_desktop_DATA) @$(NORMAL_INSTALL) - test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" @list='$(dist_desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -2442,8 +2509,11 @@ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -2460,8 +2530,11 @@ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -2476,24 +2549,6 @@ @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir) -install-nodist_pkgdataDATA: $(nodist_pkgdata_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" - @list='$(nodist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ - done - -uninstall-nodist_pkgdataDATA: - @$(NORMAL_UNINSTALL) - @list='$(nodist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -2592,6 +2647,9 @@ || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ @@ -2658,7 +2716,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -2726,7 +2784,7 @@ check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man6dir)" "$(DESTDIR)$(appicondir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man6dir)" "$(DESTDIR)$(appicondir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -2822,8 +2880,7 @@ info-am: install-data-am: install-dist_appiconDATA install-dist_desktopDATA \ - install-dist_docDATA install-dist_pkgdataDATA install-man \ - install-nodist_pkgdataDATA + install-dist_docDATA install-dist_pkgdataDATA install-man install-dvi: install-dvi-am @@ -2875,8 +2932,7 @@ uninstall-am: uninstall-dist_appiconDATA uninstall-dist_binSCRIPTS \ uninstall-dist_desktopDATA uninstall-dist_docDATA \ uninstall-dist_pkgdataDATA uninstall-man \ - uninstall-nodist_binSCRIPTS uninstall-nodist_pkgdataDATA \ - uninstall-pkglibexecPROGRAMS + uninstall-nodist_binSCRIPTS uninstall-pkglibexecPROGRAMS uninstall-man: uninstall-man6 @@ -2885,8 +2941,8 @@ .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-generic clean-libtool clean-local \ clean-noinstLTLIBRARIES clean-pkglibexecPROGRAMS ctags dist \ - dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar \ - dist-tarZ dist-xz dist-zip distcheck distclean \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \ + dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ @@ -2896,17 +2952,16 @@ install-dist_pkgdataDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-man6 \ - install-nodist_binSCRIPTS install-nodist_pkgdataDATA \ - install-pdf install-pdf-am install-pkglibexecPROGRAMS \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-dist_appiconDATA \ - uninstall-dist_binSCRIPTS uninstall-dist_desktopDATA \ - uninstall-dist_docDATA uninstall-dist_pkgdataDATA \ - uninstall-man uninstall-man6 uninstall-nodist_binSCRIPTS \ - uninstall-nodist_pkgdataDATA uninstall-pkglibexecPROGRAMS + install-nodist_binSCRIPTS install-pdf install-pdf-am \ + install-pkglibexecPROGRAMS install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-dist_appiconDATA uninstall-dist_binSCRIPTS \ + uninstall-dist_desktopDATA uninstall-dist_docDATA \ + uninstall-dist_pkgdataDATA uninstall-man uninstall-man6 \ + uninstall-nodist_binSCRIPTS uninstall-pkglibexecPROGRAMS \ \ @@ -2942,7 +2997,59 @@ libxcb1 \ zlib1g -.PHONY: clean-local dist-nixbin-dir dist-nixbin-libsrc dist-nixbin dist-nixbin-xz +windows/boost-program_options-1.51.0/stage/lib/libboost_program_options.dll: + cd windows/boost-program_options-1.51.0/ ;\ + ./bootstrap.sh ;\ + rm -rf stage ;\ + rm -rf bin.v2 ;\ + ./b2 --user-config=tools/build/v2/user-config_i686-w64-mingw32-gcc.jam toolset=gcc-mingw32 target-os=windows variant=release link=shared -sNO_BZIP2=1 -sNO_ZLIB=1 linkflags='-static-libgcc -static-libstdc++' stage/lib/libboost_program_options.dll stage/lib/libboost_program_options.dll.a + +windows/zlib-1.2.7/zlib1.dll: + cd windows/zlib-1.2.7/ && \ + make -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- + +windows/SDL-1.2.15/build/.libs/SDL.dll: + cd windows/SDL-1.2.15/ && \ + ./configure --host=i686-w64-mingw32 && \ + make LDFLAGS='-static-libgcc -static-libstdc++' + +windows/libconfig-1.4.8/lib/.libs/libconfig++.a: + cd windows/libconfig-1.4.8/ && \ + ./configure --host=i686-w64-mingw32 && \ + make LDFLAGS='-static-libgcc -static-libstdc++' + +@HAS_WINDOWS_LDFLAGS_TRUE@dist-hook: lierolibre.exe $(WINDOWS_LIBS) +@HAS_WINDOWS_LDFLAGS_TRUE@ for i in $(WINDOWS_LIBS_DLL) .libs/lierolibre.exe; do \ +@HAS_WINDOWS_LDFLAGS_TRUE@ $(STRIP) $$i -o $(distdir)/$$(basename $$i); \ +@HAS_WINDOWS_LDFLAGS_TRUE@ chmod +x $(distdir)/$$(basename $$i); done +@HAS_WINDOWS_LDFLAGS_TRUE@ cp scripts/lierolibre-cmd.bat $(distdir) +@HAS_WINDOWS_LDFLAGS_TRUE@ cp $(distdir)/data/liero.cfg $(distdir)/data/lierocfg.txt +@HAS_WINDOWS_LDFLAGS_TRUE@ for i in $(WINDOWS_TXT); do \ +@HAS_WINDOWS_LDFLAGS_TRUE@ cp $(distdir)/$$i $(distdir)/$$i.txt; \ +@HAS_WINDOWS_LDFLAGS_TRUE@ sed 's/$$/ /' -i $(distdir)/$$i.txt; done +@HAS_WINDOWS_LDFLAGS_TRUE@ mkdir $(distdir)/user +@HAS_WINDOWS_LDFLAGS_TRUE@ mkdir $(distdir)/libsrc +@HAS_WINDOWS_LDFLAGS_TRUE@ cp -r windows/SDL-1.2.15/ $(distdir)/libsrc/ +@HAS_WINDOWS_LDFLAGS_TRUE@ cp -r windows/libconfig-1.4.8/ $(distdir)/libsrc/ +@HAS_WINDOWS_LDFLAGS_TRUE@ -make -C $(distdir)/libsrc/SDL-1.2.15/ distclean +@HAS_WINDOWS_LDFLAGS_TRUE@ -make -C $(distdir)/libsrc/libconfig-1.4.8/ distclean +@HAS_WINDOWS_LDFLAGS_TRUE@ sed '/no longer applies./r COPYING_winbin' -i $(distdir)/COPYING.txt +@HAS_WINDOWS_LDFLAGS_TRUE@ sed \ +@HAS_WINDOWS_LDFLAGS_TRUE@ -e '/START_MACHINE_READABLE/,/END_MACHINE_READABLE/d' \ +@HAS_WINDOWS_LDFLAGS_TRUE@ -e '/.*_HUMAN_READABLE/d' \ +@HAS_WINDOWS_LDFLAGS_TRUE@ -i $(distdir)/COPYING.txt +@HAS_WINDOWS_LDFLAGS_TRUE@ sed '/ separate licenses, and not covered under the BSD-2-Clause license/r COPYING_winbin' -i $(distdir)/COPYING.txt +@HAS_WINDOWS_LDFLAGS_TRUE@ sed \ +@HAS_WINDOWS_LDFLAGS_TRUE@ -e '/START_HUMAN_READABLE/,/END_HUMAN_READABLE/d' \ +@HAS_WINDOWS_LDFLAGS_TRUE@ -e '/.*_MACHINE_READABLE/d' \ +@HAS_WINDOWS_LDFLAGS_TRUE@ -i $(distdir)/COPYING.txt +@HAS_WINDOWS_LDFLAGS_FALSE@dist-hook: + cp $(distdir)/src/gvl/_build/Gvl_C++0x.props \ + "$(distdir)/src/gvl/_build/Gvl C++0x.props" + cp $(distdir)/src/gvl/_build/Gvl_IEEE_SEE2.props \ + "$(distdir)/src/gvl/_build/Gvl IEEE SEE2.props" + cp $(distdir)/src/gvl/_build/Gvl_Standard_Config.props \ + "$(distdir)/src/gvl/_build/Gvl Standard Config.props" $(nodist_bin_SCRIPTS): scripts/lierolibre.am install -d scripts/ @@ -2978,9 +3085,10 @@ $(srcdir)/data/sounds/ \ $@ +.PHONY: clean-local dist-nixbin-dir dist-nixbin-libcopyright dist-nixbin-libsrc dist-nixbin dist-nixbin-xz + clean-local: rm -f \ - $(nodist_pkgdata_DATA) \ $(nodist_bin_SCRIPTS) \ $(nodist_man6_MANS) \ $(MANS_TXT) @@ -3038,20 +3146,21 @@ dist-nixbin-libsrc: install -d libsrc/ cd libsrc/ && \ - for i in $(NIXBIN_LIB_DEBS); do \ - apt-get source --download-only $$i=$$(dpkg -s $$i | sed -n 's/^Version:\ \(.*\)/\1/p') || \ - touch 00MISSING_$$i.debsource; done + LANG=C apt-get source --download-only \ + $$(for i in $(NIXBIN_LIB_DEBS); do \ + echo $$i=$$(dpkg -s $$i | \ + sed -n 's/^Version:\ \(.*\)/\1/p'); done) 2>&1 >/dev/null | \ + sed -n 's/E: Unable to find a source package for \(.*\)/\1/p' | \ + xargs -I '{}' touch 00MISSING_'{}'.debsource -dist-nixbin-dir: distdir $(pkglibexec_PROGRAMS) $(NIXBIN_LIBFILES) $(nodist_pkgdata_DATA) \ +dist-nixbin-dir: distdir $(pkglibexec_PROGRAMS) $(NIXBIN_LIBFILES) \ $(MANS_TXT) dist-nixbin-libcopyright dist-nixbin-libsrc cp -aT $(PACKAGE_DIRNAME) $(NIXBIN_DIRNAME) cp -a lib/ $(NIXBIN_DIRNAME) cp -a libsrc/ $(NIXBIN_DIRNAME) cp -a $(pkglibexec_PROGRAMS) $(NIXBIN_DIRNAME) - cp -a $(nodist_pkgdata_DATA) $(NIXBIN_DIRNAME)/data/ cp -a $(nodist_man6_MANS) $(NIXBIN_DIRNAME)/man/ cp -a $(MANS_TXT) $(NIXBIN_DIRNAME)/man/ - cp -a README_linuxbin $(NIXBIN_DIRNAME) dist-nixbin: dist-nixbin-dir tar caf $(NIXBIN_DIRNAME).tar.gz $(NIXBIN_DIRNAME) diff -Nru lierolibre-0.4/NEWS lierolibre-0.5/NEWS --- lierolibre-0.4/NEWS 2012-06-11 22:48:36.000000000 +0000 +++ lierolibre-0.5/NEWS 2012-11-15 20:40:56.000000000 +0000 @@ -1,6 +1,19 @@ lierolibre NEWS - History of user-visible changes. -Version 0.4 - May 2012, by Martin Erik Werner + +Version 0.5 - November 2012, by Martin Erik Werner +* Fixed packgfx and packlev scripts to work with newer ImageMagick +* Fixed the packsounds script so that it won't fail with non-english shell +* Removed unused fullscreen resolution extension menu options +* Fixed default keybind Right Alt not working on Linux +* Fixed extended controls being empty if loaded from non-extended LIERO.DAT + + Closes: http://code.google.com/p/liero/issues/detail?id=3 +* Changed windows homedir name from "settings" to "user" +* Pre-packed LIERO.CHR and LIERO.SND are now included in the source release +* Enabled cross-compilation from Linux for Windows + + +Version 0.4 - June 2012, by Martin Erik Werner * Fixed a bug where the EXE file path would not be set * Updated CFG file with variable name corrections + New CFG files (v1) will be written with correct names diff -Nru lierolibre-0.4/README.txt lierolibre-0.5/README.txt --- lierolibre-0.4/README.txt 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/README.txt 2012-11-07 17:57:31.000000000 +0000 @@ -0,0 +1,58 @@ +lierolibre is an old-school earthworm action game. It is a direct fork of Liero +(OpenLiero). + +Features: + * 2 worms, 40 weapons, great playability, two game modes: Kill'em All + and Game of Tag, plus AI-players without true intelligence! + * Dat nostalgia + * Extensions via a hidden F1 menu + + Replays + + Game controller support + + Powerlevel palettes + * Ability to write game variables to plain text files + * Ability to load game variables from both EXE and plain text files + * New freely licensed audio + +To switch between different window sizes, use F6, F7 and F8, to switch to +fullscreen, use F5 or Alt+Enter. + +The copied file 'user\lierocfg.txt' is a plain text file containing all the +game variables, this file is intented to be modified, go wild! Some things are +likely to not work (make the game refuse to start, or crash) though: + ! Appending/Deleting elements + ! Changing integers to strings, strings to integers, etc. + ! Changing the sine and cosine tables + +To use custom levels place the .lev files in the 'user' directory. + +In order to make lierolibre load and write files differently you will need to +use the command line, to start a command line prompt in the lierolibre +directory run the lierolibre-cmd.bat script. + +The available command-line options for lierolibre are: + -f [ --file ] arg read game variables from file or directory + -d [ --dir ] arg load game data from separate directory + -w [ --write ] arg write game variables to file + -v [ --sdlvideo ] arg set the SDL_VIDEODRIVER environment variable + -h [ --help ] print this help message + +In addition, positional arguments are automatically assigned to file, dir, and +write, in that order, hence executing + lierolibre.exe foo.txt foodir bar.txt +is equivalent to + lierolibre.exe -f foo.txt -d foodir -w bar.txt + +To extract the game variables from a modded LIERO.EXE file, use + lierolibre.exe -f path\to\LIERO.EXE -d path\to\data -w mod.txt +Note that the -d option can be omitted if the data files are in the same +directory as the LIERO.EXE file (and named correctly). + +To load a custom game variables text file use + lierolibre.exe -f path\to\mod.txt -d path\to\data +Again, if the data files are in the same directory as mod.txt, the -d option +can be omitted. + +Please report bugs at https://bugs.launchpad.net/lierolibre/+filebug + +For more information visit the Launchpad page: +https://launchpad.net/lierolibre diff -Nru lierolibre-0.4/README_linuxbin lierolibre-0.5/README_linuxbin --- lierolibre-0.4/README_linuxbin 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/README_linuxbin 2012-11-07 17:57:31.000000000 +0000 @@ -0,0 +1,12 @@ +The binary linux release includes a lib/ directory with most of the libs needed +to run lierolibre, it is compiled with the relative path option to allow the +game to find these libraries. + +With luck it will work in your case, if not, compiling from source is usually +more likely to produce a working result. + +Source code for the libraries which require it are available in the libsrc/ +directory. + +License texts for all included libraries are available in the lib/ directory. + diff -Nru lierolibre-0.4/aclocal.m4 lierolibre-0.5/aclocal.m4 --- lierolibre-0.4/aclocal.m4 2012-06-11 22:59:52.000000000 +0000 +++ lierolibre-0.5/aclocal.m4 2012-11-15 21:03:09.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -180,6 +180,192 @@ fi[]dnl ])# PKG_CHECK_MODULES +# Configure paths for SDL +# Sam Lantinga 9/21/99 +# stolen from Manish Singh +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +# serial 1 + +dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS +dnl +AC_DEFUN([AM_PATH_SDL], +[dnl +dnl Get the cflags and libraries from the sdl-config script +dnl +AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], + sdl_prefix="$withval", sdl_prefix="") +AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], + sdl_exec_prefix="$withval", sdl_exec_prefix="") +AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], + , enable_sdltest=yes) + + if test x$sdl_exec_prefix != x ; then + sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config + fi + fi + if test x$sdl_prefix != x ; then + sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_prefix/bin/sdl-config + fi + fi + + as_save_PATH="$PATH" + if test "x$prefix" != xNONE; then + PATH="$prefix/bin:$prefix/usr/bin:$PATH" + fi + AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) + PATH="$as_save_PATH" + min_sdl_version=ifelse([$1], ,0.11.0,$1) + AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) + no_sdl="" + if test "$SDL_CONFIG" = "no" ; then + no_sdl=yes + else + SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` + SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` + + sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_sdltest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $SDL_CFLAGS" + CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" +dnl +dnl Now check if the installed SDL is sufficiently new. (Also sanity +dnl checks the results of sdl-config to some extent +dnl + rm -f conf.sdltest + AC_TRY_RUN([ +#include +#include +#include +#include "SDL.h" + +char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main (int argc, char *argv[]) +{ + int major, minor, micro; + char *tmp_version; + + /* This hangs on some systems (?) + system ("touch conf.sdltest"); + */ + { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_sdl_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_sdl_version"); + exit(1); + } + + if (($sdl_major_version > major) || + (($sdl_major_version == major) && ($sdl_minor_version > minor)) || + (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); + printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); + printf("*** to point to the correct copy of sdl-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_sdl" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$SDL_CONFIG" = "no" ; then + echo "*** The sdl-config script installed by SDL could not be found" + echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the SDL_CONFIG environment variable to the" + echo "*** full path to sdl-config." + else + if test -f conf.sdltest ; then + : + else + echo "*** Could not run SDL test program, checking why..." + CFLAGS="$CFLAGS $SDL_CFLAGS" + CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + AC_TRY_LINK([ +#include +#include "SDL.h" + +int main(int argc, char *argv[]) +{ return 0; } +#undef main +#define main K_and_R_C_main +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding SDL or finding the wrong" + echo "*** version of SDL. If it is not finding SDL, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means SDL was incorrectly installed" + echo "*** or that you have moved SDL since it was installed. In the latter case, you" + echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + SDL_CFLAGS="" + SDL_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(SDL_CFLAGS) + AC_SUBST(SDL_LIBS) + rm -f conf.sdltest +]) + # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software # Foundation, Inc. # @@ -198,7 +384,7 @@ [am__api_version='1.11' 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.11.3], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -214,7 +400,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -1169,4 +1355,3 @@ m4_include([src/m4/ltsugar.m4]) m4_include([src/m4/ltversion.m4]) m4_include([src/m4/lt~obsolete.m4]) -m4_include([src/m4/sdl.m4]) diff -Nru lierolibre-0.4/configure lierolibre-0.5/configure --- lierolibre-0.4/configure 2012-06-11 22:59:53.000000000 +0000 +++ lierolibre-0.5/configure 2012-11-15 21:03:10.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for lierolibre C++ 0.4. +# Generated by GNU Autoconf 2.69 for lierolibre C++ 0.5. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='lierolibre C++' PACKAGE_TARNAME='lierolibre' -PACKAGE_VERSION='0.4' -PACKAGE_STRING='lierolibre C++ 0.4' +PACKAGE_VERSION='0.5' +PACKAGE_STRING='lierolibre C++ 0.5' PACKAGE_BUGREPORT='martinerikwerner@gmail.com' PACKAGE_URL='https://gitorious.org/lierolibre' @@ -641,6 +641,11 @@ LIBOBJS GVL_LIBS GVL_CFLAGS +HAS_WINDOWS_LDFLAGS_FALSE +HAS_WINDOWS_LDFLAGS_TRUE +LIBCONFIGXX_CPPFLAGS +WINDOWS_LDFLAGS +WINDOWS_CPPFLAGS ZLIB_LIBS ZLIB_CFLAGS SDL_MIXER_LIBS @@ -786,6 +791,8 @@ with_sdl_prefix with_sdl_exec_prefix enable_sdltest +enable_windows_includes +enable_windows_libraries with_gvl_include_path with_gvl_lib_path enable_relpath @@ -1352,7 +1359,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lierolibre C++ 0.4 to adapt to many kinds of systems. +\`configure' configures lierolibre C++ 0.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1422,7 +1429,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lierolibre C++ 0.4:";; + short | recursive ) echo "Configuration of lierolibre C++ 0.5:";; esac cat <<\_ACEOF @@ -1438,6 +1445,12 @@ --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-sdltest Do not try to compile and run a test SDL program + --enable-windows-includes + use includes from local folder ./windows/include/ + --enable-windows-libraries + compile and use libraries from local folder + ./windows/include/, and force static linking for + libconfig++ --enable-relpath add lib/ to the runtime library search path Optional Packages: @@ -1549,7 +1562,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lierolibre C++ configure 0.4 +lierolibre C++ configure 0.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2314,7 +2327,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lierolibre C++ $as_me 0.4, which was +It was created by lierolibre C++ $as_me 0.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4774,10 +4787,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -4816,7 +4825,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -7785,7 +7794,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -9955,17 +9964,6 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -10082,7 +10080,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -11587,7 +11585,7 @@ # Define the identity of the package. PACKAGE='lierolibre' - VERSION='0.4' + VERSION='0.5' cat >>confdefs.h <<_ACEOF @@ -13505,9 +13503,6 @@ ld_shlibs_CXX=yes ;; - gnu*) - ;; - haiku*) archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' link_all_deplibs_CXX=yes @@ -13669,7 +13664,7 @@ inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -14529,7 +14524,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -15401,17 +15396,6 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -15528,7 +15512,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -16246,8 +16230,8 @@ if test x"$HAS_SOX" != x"yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SoX not found" >&5 -$as_echo "$as_me: WARNING: SoX not found" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SoX not found, you will need this to build the sound data!" >&5 +$as_echo "$as_me: WARNING: SoX not found, you will need this to build the sound data!" >&2;} fi # Extract the first word of "convert", so it can be a program name with args. @@ -16305,8 +16289,8 @@ if test "x$ac_cv_header_boost_program_options_hpp" = xyes; then : BOOST_PO_LIBS="-lboost_program_options" else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: boost_program_options header not found" >&5 -$as_echo "$as_me: WARNING: boost_program_options header not found" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: boost_program_options header not found, you will need this to compile lierolibre!" >&5 +$as_echo "$as_me: WARNING: boost_program_options header not found, you will need this to compile lierolibre!" >&2;} fi @@ -16906,7 +16890,7 @@ # Fall back on a quite stupid header check if pkg-config doesn't work # (pkg-config for SDL_mixer is relatively new) -if test "x$pkgcSDLM" = "xno"; then : +if test x"$pkgcSDLM" = x"no"; then : for ac_header in SDL/SDL_mixer.h do : @@ -16917,8 +16901,8 @@ _ACEOF SDL_MIXER_CFLAGS="-D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL" else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SDL_mixer headers not found" >&5 -$as_echo "$as_me: WARNING: SDL_mixer headers not found" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SDL_mixer headers not found, you will need this to compile lierolibre!" >&5 +$as_echo "$as_me: WARNING: SDL_mixer headers not found, you will need this to compile lierolibre!" >&2;} fi done @@ -16962,8 +16946,8 @@ if test "x$ac_cv_lib_SDL_mixer_Mix_OpenAudio" = xyes; then : SDL_MIXER_LIBS="-lSDL_mixer -lSDL" else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SDL_mixer library not found" >&5 -$as_echo "$as_me: WARNING: SDL_mixer library not found" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SDL_mixer library not found, you will need this to link lierolibre!" >&5 +$as_echo "$as_me: WARNING: SDL_mixer library not found, you will need this to link lierolibre!" >&2;} fi @@ -17061,6 +17045,33 @@ fi +# Check whether --enable-windows-includes was given. +if test "${enable_windows_includes+set}" = set; then : + enableval=$enable_windows_includes; WINDOWS_CPPFLAGS='-I./windows/include/' +fi + + + +# Search paths for embedded windows libraries, force libconfig++ static +# (I've been unable to link stdc++ and gcc_s statically in a shared +# libconfig++-9.dll) +# Check whether --enable-windows-libraries was given. +if test "${enable_windows_libraries+set}" = set; then : + enableval=$enable_windows_libraries; WINDOWS_LDFLAGS='-Lwindows/boost-program_options-1.51.0/stage/lib -Lwindows/zlib-1.2.7 -Lwindows/SDL-1.2.15/build/.libs -Lwindows/libconfig-1.4.8/lib/.libs/ -Lwindows/SDL_mixer-1.2.12/lib/x86/ -lboost_program_options -static-libgcc -static-libstdc++'; LIBCONFIGXX_CPPFLAGS="-DLIBCONFIGXX_STATIC"; LIBCONFIGXX_LIBS="windows/libconfig-1.4.8/lib/.libs/libconfig++.a" +fi + + + + + if test "$WINDOWS_LDFLAGS"; then + HAS_WINDOWS_LDFLAGS_TRUE= + HAS_WINDOWS_LDFLAGS_FALSE='#' +else + HAS_WINDOWS_LDFLAGS_TRUE='#' + HAS_WINDOWS_LDFLAGS_FALSE= +fi + + # Get libgvl library and include locations # Check whether --with-gvl-include-path was given. @@ -17112,8 +17123,8 @@ _ACEOF else - { $as_echo "$as_me:${as_lineno-$LINENO}: libtut headers not found" >&5 -$as_echo "$as_me: libtut headers not found" >&you will need these to compile gvltest;} + { $as_echo "$as_me:${as_lineno-$LINENO}: libtut headers not found, you will need these to compile gvltest" >&5 +$as_echo "$as_me: libtut headers not found, you will need these to compile gvltest" >&6;} fi done @@ -17784,7 +17795,7 @@ want_relative=no fi -if test "$want_relative" = yes; then +if test x"$want_relative" = xyes; then RELPATH_CFLAGS='-DUSE_RELATIVE_PATHS' RELPATH_LDFLAGS="-Wl,-rpath -Wl,\\\$\$ORIGIN/lib" fi @@ -17922,6 +17933,10 @@ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAS_WINDOWS_LDFLAGS_TRUE}" && test -z "${HAS_WINDOWS_LDFLAGS_FALSE}"; then + as_fn_error $? "conditional \"HAS_WINDOWS_LDFLAGS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -18319,7 +18334,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lierolibre C++ $as_me 0.4, which was +This file was extended by lierolibre C++ $as_me 0.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18386,7 +18401,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lierolibre C++ config.status 0.4 +lierolibre C++ config.status 0.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru lierolibre-0.4/configure.ac lierolibre-0.5/configure.ac --- lierolibre-0.4/configure.ac 2012-06-11 22:48:36.000000000 +0000 +++ lierolibre-0.5/configure.ac 2012-11-15 20:41:16.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ([2.59]) -AC_INIT([lierolibre C++], [0.4], [martinerikwerner@gmail.com], [lierolibre], [https://gitorious.org/lierolibre]) +AC_INIT([lierolibre C++], [0.5], [martinerikwerner@gmail.com], [lierolibre], [https://gitorious.org/lierolibre]) AC_CONFIG_SRCDIR([src/worm.cpp]) AC_CONFIG_MACRO_DIR([src/m4]) AC_CONFIG_AUX_DIR([src/build-aux]) @@ -23,7 +23,7 @@ AC_CHECK_PROG(HAS_SOX, sox, yes) if test x"$HAS_SOX" != x"yes" ; then - AC_MSG_WARN(SoX not found, you will need this to build the sound data!) + AC_MSG_WARN([SoX not found, you will need this to build the sound data!]) fi AC_CHECK_PROG(HAS_IM, convert, yes) @@ -36,7 +36,7 @@ AC_LANG_PUSH([C++]) AC_CHECK_HEADER([boost/program_options.hpp], [BOOST_PO_LIBS="-lboost_program_options"], - [AC_MSG_WARN(boost_program_options header not found, you will need this to compile lierolibre!)]) + [AC_MSG_WARN([boost_program_options header not found, you will need this to compile lierolibre!])]) AC_LANG_POP([C++]) AC_SUBST(BOOST_PO_LIBS) @@ -57,17 +57,35 @@ # Fall back on a quite stupid header check if pkg-config doesn't work # (pkg-config for SDL_mixer is relatively new) -AS_IF([test "x$pkgcSDLM" = "xno"], [ +AS_IF([test x"$pkgcSDLM" = x"no"], [ AC_CHECK_HEADERS([SDL/SDL_mixer.h], [SDL_MIXER_CFLAGS="-D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL"], - [AC_MSG_WARN(SDL_mixer headers not found, you will need this to compile lierolibre!)]) + [AC_MSG_WARN([SDL_mixer headers not found, you will need this to compile lierolibre!])]) AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio, [SDL_MIXER_LIBS="-lSDL_mixer -lSDL"], - [AC_MSG_WARN(SDL_mixer library not found, you will need this to link lierolibre!)]) + [AC_MSG_WARN([SDL_mixer library not found, you will need this to link lierolibre!])]) ]) PKG_CHECK_MODULES([ZLIB], [zlib]) +AC_ARG_ENABLE([windows-includes], + [AS_HELP_STRING([--enable-windows-includes], + [use includes from local folder ./windows/include/])], + [WINDOWS_CPPFLAGS='-I./windows/include/']) +AC_SUBST([WINDOWS_CPPFLAGS]) + +# Search paths for embedded windows libraries, force libconfig++ static +# (I've been unable to link stdc++ and gcc_s statically in a shared +# libconfig++-9.dll) +AC_ARG_ENABLE([windows-libraries], + [AS_HELP_STRING([--enable-windows-libraries], + [compile and use libraries from local folder ./windows/include/, and force static linking for libconfig++])], + [WINDOWS_LDFLAGS='-Lwindows/boost-program_options-1.51.0/stage/lib -Lwindows/zlib-1.2.7 -Lwindows/SDL-1.2.15/build/.libs -Lwindows/libconfig-1.4.8/lib/.libs/ -Lwindows/SDL_mixer-1.2.12/lib/x86/ -lboost_program_options -static-libgcc -static-libstdc++'; LIBCONFIGXX_CPPFLAGS="-DLIBCONFIGXX_STATIC"; LIBCONFIGXX_LIBS="windows/libconfig-1.4.8/lib/.libs/libconfig++.a"]) +AC_SUBST([WINDOWS_LDFLAGS]) +AC_SUBST([LIBCONFIGXX_CPPFLAGS]) +AC_SUBST([LIBCONFIGXX_LIBS]) +AM_CONDITIONAL([HAS_WINDOWS_LDFLAGS], [test "$WINDOWS_LDFLAGS"]) + # Get libgvl library and include locations AC_ARG_WITH([gvl-include-path], [AS_HELP_STRING([--with-gvl-include-path], @@ -88,7 +106,7 @@ AC_LANG_PUSH([C++]) AC_CHECK_HEADERS([tut/tut.hpp tut/tut_reporter.hpp tut/tut_restartable.hpp], [], - [AC_MSG_NOTICE(libtut headers not found, you will need these to compile gvltest)]) + [AC_MSG_NOTICE([libtut headers not found, you will need these to compile gvltest])]) AC_LANG_POP([C++]) # Checks for typedefs, structures, and compiler characteristics. @@ -117,7 +135,7 @@ AC_ARG_ENABLE([relpath], AC_HELP_STRING([--enable-relpath], [add lib/ to the runtime library search path]), [want_relative=yes], [want_relative=no]) -if test "$want_relative" = yes; then +if test x"$want_relative" = xyes; then RELPATH_CFLAGS='-DUSE_RELATIVE_PATHS' RELPATH_LDFLAGS="-Wl,-rpath -Wl,\\\$\$ORIGIN/lib" fi diff -Nru lierolibre-0.4/data/LICENSE.TXT lierolibre-0.5/data/LICENSE.TXT --- lierolibre-0.4/data/LICENSE.TXT 2012-04-23 11:30:04.000000000 +0000 +++ lierolibre-0.5/data/LICENSE.TXT 2012-11-06 23:00:21.000000000 +0000 @@ -1,14 +1,14 @@ -The original Liero data and binary files are copyright 1998 Joosa Riekkinen -They are, unless otherwise stated, available under the WTFPL license: - - -The LIERO.EXE binary contains the SMIX sound library: - -The author of SMIX has stated that it is available under a BSD-3-Clause license, -with a request for donations for use in commercial products. - -LIERO.SND contains sounds from Molez: - -Molez is freeware and freely distributable. - -The license in LIEROENG.TXT is no longer valid but the file is kept for nostalgic purposes ;) +The original Liero data and binary files are copyright 1998 Joosa Riekkinen +They are, unless otherwise stated, available under the WTFPL license: + + +The LIERO.EXE binary contains the SMIX sound library: + +The author of SMIX has stated that it is available under a BSD-3-Clause license, +with a request for donations for use in commercial products. + +LIERO.SND contains sounds from Molez: + +Molez is freeware and freely distributable. + +The license in LIEROENG.TXT is no longer valid but the file is kept for nostalgic purposes ;) Binary files /tmp/t35ZfYZHMq/lierolibre-0.4/data/LIERO.CHR and /tmp/1dMjB9QjjN/lierolibre-0.5/data/LIERO.CHR differ Binary files /tmp/t35ZfYZHMq/lierolibre-0.4/data/LIERO.SND and /tmp/1dMjB9QjjN/lierolibre-0.5/data/LIERO.SND differ diff -Nru lierolibre-0.4/data/liero.cfg lierolibre-0.5/data/liero.cfg --- lierolibre-0.4/data/liero.cfg 2012-06-11 11:44:00.000000000 +0000 +++ lierolibre-0.5/data/liero.cfg 2012-11-06 19:30:14.000000000 +0000 @@ -1,3 +1,4 @@ +Version = 1; Texts : { random = "[RANDOM]"; @@ -258,81 +259,81 @@ NRMinLength = 170; NRMaxLength = 4000; BonusGravity = 1500; - BObjGravity = 89; - WormFloatPower = 100; - BloodLimit = 160; - WormFricMult = 160; - WormFricDiv = 5; - WormMinSpawnDistLast = 5; - WormMinSpawnDistEnemy = 494; - WormSpawnRectX = 340; - WormSpawnRectY = 83; - WormSpawnRectW = 100; - WormSpawnRectH = 2; - AimFricMult = 2; - AimFricDiv = 2; - NRThrowVelX = 3; + WormFricMult = 89; + WormFricDiv = 100; + WormMinSpawnDistLast = 160; + WormMinSpawnDistEnemy = 160; + WormSpawnRectX = 5; + WormSpawnRectY = 5; + WormSpawnRectW = 494; + WormSpawnRectH = 340; + AimFricMult = 83; + AimFricDiv = 100; + NRThrowVelX = 2; NRThrowVelY = 2; - NRForceShlX = 3; - NRForceDivX = 4; - NRForceShlY = 40; - NRForceDivY = 100; - NRForceLenShl = 220; - BonusBounceMul = 116; - BonusBounceDiv = 64; - BonusFlickerTime = 12; - BonusDropChance = 64; - SplinterLarpaVelDiv = 24; - SplinterCracklerVelDiv = 24; - WormFloatLevel = 62; - BonusSpawnRectX = 64; - BonusSpawnRectY = 10; - BonusSpawnRectW = 51; - BonusSpawnRectH = 10; - AimMaxRight = 29; - AimMinRight = 80; - AimMaxLeft = 2; - AimMinLeft = 1000; - NRColourBegin = 1700; - NRColourEnd = 3; - BonusExplodeRisk = 3; - BonusHealthVar = 25; - BonusMinHealth = 25; - LaserWeapon = 500; - FirstBloodColour = 0; - NumBloodColours = 0; - RemExpObject = 0; - NRPullVel = 0; - NRReleaseVel = 163; - FallDamageRight = -8386178; - FallDamageLeft = -1410; - FallDamageDown = -1410; - FallDamageUp = 504; - BloodStepUp = 350; - BloodStepDown = 35; + NRForceShlX = 2; + NRForceDivX = 3; + NRForceShlY = 2; + NRForceDivY = 3; + NRForceLenShl = 4; + BonusBounceMul = 40; + BonusBounceDiv = 100; + BonusFlickerTime = 220; + AimMaxRight = 116; + AimMinRight = 64; + AimMaxLeft = 12; + AimMinLeft = 64; + NRPullVel = 24; + NRReleaseVel = 24; + NRColourBegin = 62; + NRColourEnd = 64; + BonusExplodeRisk = 10; + BonusHealthVar = 51; + BonusMinHealth = 10; + LaserWeapon = 29; + FirstBloodColour = 80; + NumBloodColours = 2; + BObjGravity = 1000; + BonusDropChance = 1700; + SplinterLarpaVelDiv = 3; + SplinterCracklerVelDiv = 3; + BloodStepUp = 25; + BloodStepDown = 25; + BloodLimit = 500; + FallDamageRight = 0; + FallDamageLeft = 0; + FallDamageDown = 0; + FallDamageUp = 0; + WormFloatLevel = 163; + WormFloatPower = -8386178; + BonusSpawnRectX = -1410; + BonusSpawnRectY = -1410; + BonusSpawnRectW = 504; + BonusSpawnRectH = 350; + RemExpObject = 35; }; Strings : { InitSound = "Initializing sound system..."; LoadingSounds = "Loading sounds..."; - Init_BaseIO = "Loading & thinking..."; - Init_IRQ = "OK"; - Init_DMA8 = "OK"; - Init_DMA16 = "Press any key..."; - Init_DSPVersion = " committed suicide"; - Init_Colon = "Killed "; - Init_16bit = "You're 'IT' now!"; - Init_Autoinit = "BaseIO="; - Init_XMSSucc = "h IRQ"; - Init_FreeXMS = " DMA8="; - Init_k = " DMA16="; - LoadingAndThinking = "DSP version "; - OK = ": "; - OK2 = "16-bit, "; - PressAnyKey = "Auto-initialized"; - CommittedSuicideMsg = "Extended memory succesfully initialized"; - KilledMsg = "Free XMS memory: "; - YoureIt = "k "; + LoadingAndThinking = "Loading & thinking..."; + OK = "OK"; + OK2 = "OK"; + PressAnyKey = "Press any key..."; + CommittedSuicideMsg = " committed suicide"; + KilledMsg = "Killed "; + YoureIt = "You're 'IT' now!"; + Init_BaseIO = "BaseIO="; + Init_IRQ = "h IRQ"; + Init_DMA8 = " DMA8="; + Init_DMA16 = " DMA16="; + Init_DSPVersion = "DSP version "; + Init_Colon = ": "; + Init_16bit = "16-bit, "; + Init_Autoinit = "Auto-initialized"; + Init_XMSSucc = "Extended memory succesfully initialized"; + Init_FreeXMS = "Free XMS memory: "; + Init_k = "k "; }; Hacks : { @@ -358,1253 +359,1253 @@ { char0 : { - width = 6; data = [ 0, 8, 8, 8, 0, 0, 0, 8, 0, 8, 0, 8, 0, 0, 8, 8, 8, 8, 8, 0, 0, 8, 0, 8, 0, 8, 0, 0, 8, 8, 0, 8, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char1 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char2 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char3 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char4 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char5 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char6 : { - width = 6; data = [ 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 8, 0, 8, 8, 8, 0, 8, 0, 0, 0, 8, 8, 0, 8, 8, 0, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char7 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char8 : { - width = 6; data = [ 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 8, 0, 8, 8, 8, 0, 8, 0, 8, 0, 8, 8, 0, 8, 8, 0, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char9 : { - width = 6; data = [ 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 8, 8, 8, 0, 8, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char10 : { - width = 4; data = [ 8, 8, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char11 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char12 : { - width = 6; data = [ 0, 8, 8, 8, 8, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 8, 8, 0, 8, 8, 0, 0, 8, 8, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char13 : { - width = 6; data = [ 8, 0, 8, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char14 : { - width = 4; data = [ 8, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char15 : { - width = 4; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char16 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char17 : { - width = 4; data = [ 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char18 : { - width = 5; data = [ 8, 8, 8, 8, 0, 0, 0, 8, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char19 : { - width = 4; data = [ 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char20 : { - width = 6; data = [ 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char21 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char22 : { - width = 6; data = [ 0, 0, 7, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 7, 0, 7, 0, 7, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char23 : { - width = 6; data = [ 0, 0, 7, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 7, 0, 7, 0, 7, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char24 : { - width = 6; data = [ 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char25 : { - width = 6; data = [ 0, 0, 7, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char26 : { - width = 5; data = [ 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char27 : { - width = 8; data = [ 0, 0, 7, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 7, 7, 7, 7, 7, 7, 7, 0, 7, 0, 0, 0, 7, 0, 0, 0, 7, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 8; }; char28 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char29 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char30 : { - width = 3; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 3; }; char31 : { - width = 2; data = [ 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 2; }; char32 : { - width = 4; data = [ 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char33 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char34 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char35 : { - width = 5; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char36 : { - width = 6; data = [ 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 8, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char37 : { - width = 3; data = [ 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 3; }; char38 : { - width = 3; data = [ 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 3; }; char39 : { - width = 3; data = [ 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 3; }; char40 : { - width = 4; data = [ 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char41 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char42 : { - width = 3; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 3; }; char43 : { - width = 5; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char44 : { - width = 2; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 2; }; char45 : { - width = 4; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char46 : { - width = 5; data = [ 0, 8, 8, 0, 0, 0, 0, 8, 0, 8, 8, 0, 0, 0, 8, 8, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char47 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char48 : { - width = 5; data = [ 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char49 : { - width = 5; data = [ 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char50 : { - width = 5; data = [ 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char51 : { - width = 5; data = [ 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char52 : { - width = 5; data = [ 0, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char53 : { - width = 5; data = [ 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char54 : { - width = 5; data = [ 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char55 : { - width = 5; data = [ 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char56 : { - width = 2; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 2; }; char57 : { - width = 3; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 3; }; char58 : { - width = 4; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char59 : { - width = 5; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char60 : { - width = 4; data = [ 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char61 : { - width = 4; data = [ 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char62 : { - width = 6; data = [ 0, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 8, 8, 8, 0, 0, 8, 0, 8, 8, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char63 : { - width = 5; data = [ 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char64 : { - width = 5; data = [ 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char65 : { - width = 5; data = [ 0, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char66 : { - width = 5; data = [ 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char67 : { - width = 5; data = [ 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char68 : { - width = 5; data = [ 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char69 : { - width = 5; data = [ 0, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char70 : { - width = 5; data = [ 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char71 : { - width = 4; data = [ 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char72 : { - width = 5; data = [ 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char73 : { - width = 5; data = [ 8, 0, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char74 : { - width = 5; data = [ 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char75 : { - width = 6; data = [ 8, 0, 0, 0, 8, 0, 0, 8, 8, 0, 8, 8, 0, 0, 8, 0, 8, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char76 : { - width = 5; data = [ 8, 0, 0, 8, 0, 0, 0, 8, 8, 0, 8, 0, 0, 0, 8, 0, 8, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char77 : { - width = 5; data = [ 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char78 : { - width = 5; data = [ 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char79 : { - width = 5; data = [ 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char80 : { - width = 5; data = [ 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char81 : { - width = 5; data = [ 0, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char82 : { - width = 4; data = [ 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char83 : { - width = 5; data = [ 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char84 : { - width = 6; data = [ 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char85 : { - width = 6; data = [ 8, 0, 8, 0, 8, 0, 0, 8, 0, 8, 0, 8, 0, 0, 8, 0, 8, 0, 8, 0, 0, 8, 0, 8, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char86 : { - width = 6; data = [ 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char87 : { - width = 5; data = [ 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char88 : { - width = 5; data = [ 8, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char89 : { - width = 3; data = [ 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 3; }; char90 : { - width = 4; data = [ 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char91 : { - width = 3; data = [ 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 3; }; char92 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char93 : { - width = 5; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char94 : { - width = 3; data = [ 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 3; }; char95 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char96 : { - width = 4; data = [ 8, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char97 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char98 : { - width = 4; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char99 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char100 : { - width = 4; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char101 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char102 : { - width = 4; data = [ 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char103 : { - width = 2; data = [ 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 2; }; char104 : { - width = 4; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char105 : { - width = 4; data = [ 8, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char106 : { - width = 2; data = [ 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 2; }; char107 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 8, 0, 0, 0, 8, 0, 8, 0, 8, 0, 0, 8, 0, 8, 0, 8, 0, 0, 8, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char108 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char109 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char110 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char111 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char112 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char113 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char114 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char115 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char116 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char117 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 8, 0, 0, 8, 0, 8, 0, 8, 0, 0, 8, 0, 8, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char118 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char119 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char120 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char121 : { - width = 4; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char122 : { - width = 2; data = [ 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 2; }; char123 : { - width = 4; data = [ 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char124 : { - width = 5; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char125 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char126 : { - width = 5; data = [ 0, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char127 : { - width = 4; data = [ 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char128 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char129 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char130 : { - width = 4; data = [ 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char131 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char132 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char133 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char134 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char135 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char136 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char137 : { - width = 4; data = [ 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char138 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char139 : { - width = 3; data = [ 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 3; }; char140 : { - width = 5; data = [ 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char141 : { - width = 5; data = [ 0, 8, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char142 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char143 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 8, 8, 0, 0, 0, 8, 8, 0, 8, 0, 0, 8, 0, 8, 8, 0, 0, 0, 8, 8, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char144 : { - width = 6; data = [ 0, 8, 8, 8, 8, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char145 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char146 : { - width = 4; data = [ 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char147 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char148 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char149 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char150 : { - width = 4; data = [ 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char151 : { - width = 5; data = [ 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char152 : { - width = 5; data = [ 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char153 : { - width = 5; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char154 : { - width = 6; data = [ 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char155 : { - width = 6; data = [ 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char156 : { - width = 7; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 7; }; char157 : { - width = 5; data = [ 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char158 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char159 : { - width = 3; data = [ 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 3; }; char160 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char161 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char162 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char163 : { - width = 0; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 0; }; char164 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char165 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char166 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char167 : { - width = 5; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char168 : { - width = 5; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char169 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char170 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char171 : { - width = 2; data = [ 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 2; }; char172 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char173 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char174 : { - width = 6; data = [ 8, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char175 : { - width = 6; data = [ 8, 0, 8, 0, 8, 0, 0, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 0, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 0, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char176 : { - width = 6; data = [ 0, 8, 0, 8, 0, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 0, 8, 0, 8, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 8, 0, 8, 0, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char177 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char178 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char179 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char180 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char181 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char182 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char183 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 8, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char184 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char185 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char186 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 8, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char187 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char188 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char189 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char190 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char191 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char192 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char193 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char194 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char195 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char196 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char197 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 8, 8, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char198 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 8, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char199 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 8, 8, 8, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char200 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 8, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char201 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 8, 8, 8, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char202 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 8, 8, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 8, 8, 8, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char203 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char204 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 8, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 8, 8, 8, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char205 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char206 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char207 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char208 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char209 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char210 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char211 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char212 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char213 : { - width = 6; data = [ 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char214 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char215 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char216 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char217 : { - width = 6; data = [ 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char218 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char219 : { - width = 6; data = [ 8, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char220 : { - width = 6; data = [ 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char221 : { - width = 6; data = [ 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char222 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 8, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char223 : { - width = 5; data = [ 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char224 : { - width = 5; data = [ 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char225 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char226 : { - width = 5; data = [ 8, 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char227 : { - width = 5; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char228 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char229 : { - width = 4; data = [ 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char230 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 8, 0, 8, 0, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char231 : { - width = 5; data = [ 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char232 : { - width = 6; data = [ 0, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 8, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char233 : { - width = 4; data = [ 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char234 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 0, 8, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char235 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 8, 0, 8, 0, 8, 0, 0, 8, 0, 8, 0, 8, 0, 0, 8, 0, 8, 0, 8, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char236 : { - width = 5; data = [ 0, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char237 : { - width = 6; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char238 : { - width = 5; data = [ 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char239 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char240 : { - width = 5; data = [ 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char241 : { - width = 5; data = [ 0, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char242 : { - width = 6; data = [ 0, 0, 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char243 : { - width = 6; data = [ 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; char244 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char245 : { - width = 5; data = [ 0, 8, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 5; }; char246 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char247 : { - width = 4; data = [ 0, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 4; }; char248 : { - width = 2; data = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 2; }; char249 : { - width = 6; data = [ 0, 0, 8, 8, 8, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]; + width = 6; }; }; Palette : diff -Nru lierolibre-0.4/data/sounds/sounds.txt lierolibre-0.5/data/sounds/sounds.txt --- lierolibre-0.4/data/sounds/sounds.txt 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/data/sounds/sounds.txt 2012-06-17 10:15:01.000000000 +0000 @@ -0,0 +1,27 @@ +The sounds in this directory are replacements for the original Liero sounds +(which are not under a completely free license). These sounds are created by +"sea", and they are licensed under the WTFPL. + + -----//----- + +Files: ALIVE.wav BAZOOKA.wav BEGIN.wav BLASTER.wav BOING.wav BUMP.wav + BURNER.wav DEATH1.wav DEATH2.wav DEATH3.wav DIRT.wav DROPSHEL.wav + EXP2.wav EXP3A.wav EXP3B.wav EXP3.wav EXP4.wav EXP5.wav HURT1.wav + HURT2.wav HURT3.wav LARPA.wav MOVEDOWN.wav MOVEUP.wav RELOADED.wav + RIFLE.wav SELECT.wav SHOTGUN.wav SHOT.wav THROW.wav +Copyright: "sea" +License: WTFPL + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + . + Copyright (C) 2004 Sam Hocevar + . + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + . + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + . + 0. You just DO WHAT THE FUCK YOU WANT TO. + diff -Nru lierolibre-0.4/debian/changelog lierolibre-0.5/debian/changelog --- lierolibre-0.4/debian/changelog 2012-06-12 12:56:52.000000000 +0000 +++ lierolibre-0.5/debian/changelog 2012-11-16 00:50:48.000000000 +0000 @@ -1,3 +1,10 @@ +lierolibre (0.5-1~ppa1~precise1) precise; urgency=low + + * New upstream version + * Release to precise PPA + + -- Martin Erik Werner Tue, 12 Jun 2012 14:49:37 +0200 + lierolibre (0.4-1~ppa1~precise1) precise; urgency=low * New upstream version diff -Nru lierolibre-0.4/debian/control lierolibre-0.5/debian/control --- lierolibre-0.4/debian/control 2012-06-12 12:48:07.000000000 +0000 +++ lierolibre-0.5/debian/control 2012-11-15 23:11:15.000000000 +0000 @@ -1,6 +1,6 @@ Source: lierolibre Section: games -Priority: extra +Priority: optional Uploaders: Martin Erik Werner Maintainer: Debian Games Team Build-Depends: autotools-dev, @@ -51,11 +51,9 @@ Package: lierolibre-dbg Architecture: any Section: debug +Priority: extra Pre-Depends: dpkg (>= 1.15.6~) Depends: lierolibre (= ${binary:Version}), ${misc:Depends} Description: debugging symbols for lierolibre - giblib is a library of handy stuff. Contains an imlib2 wrapper to avoid the - context stuff, doubly-linked lists and font styles. - . This package contains the debugging symbols for the old-school earthworm action game lierolibre. diff -Nru lierolibre-0.4/debian/rules lierolibre-0.5/debian/rules --- lierolibre-0.4/debian/rules 2012-06-12 12:48:07.000000000 +0000 +++ lierolibre-0.5/debian/rules 2012-11-15 23:03:04.000000000 +0000 @@ -24,7 +24,6 @@ override_dh_auto_install: dh_auto_install - rm debian/tmp/usr/share/doc/lierolibre/COPYING rm debian/tmp/usr/share/doc/lierolibre/ChangeLog override_dh_installchangelogs: diff -Nru lierolibre-0.4/debian/watch lierolibre-0.5/debian/watch --- lierolibre-0.4/debian/watch 2012-06-12 12:48:07.000000000 +0000 +++ lierolibre-0.5/debian/watch 2012-11-15 23:03:04.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -https://launchpad.net/lierolibre/+download https://launchpad.net/lierolibre/.+/lierolibre-(.+)\.tar\.xz +https://launchpad.net/lierolibre/+download https://launchpad.net/lierolibre/.+/lierolibre-([0-9.]+)\.tar\.xz diff -Nru lierolibre-0.4/lgpl-2.1.txt lierolibre-0.5/lgpl-2.1.txt --- lierolibre-0.4/lgpl-2.1.txt 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/lgpl-2.1.txt 2012-11-07 17:57:31.000000000 +0000 @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff -Nru lierolibre-0.4/man/lierolibre.6.am lierolibre-0.5/man/lierolibre.6.am --- lierolibre-0.4/man/lierolibre.6.am 2012-06-10 10:42:11.000000000 +0000 +++ lierolibre-0.5/man/lierolibre.6.am 2012-11-15 21:02:01.000000000 +0000 @@ -1,4 +1,4 @@ -.TH #UPPERCASE_PACKAGE# 6 2012-04-27 "#PACKAGE# #PACKAGE_VERSION#" "#PACKAGE# Manual" +.TH #UPPERCASE_PACKAGE# 6 2012-11-14 "#PACKAGE# #PACKAGE_VERSION#" "#PACKAGE# Manual" .SH NAME @@ -59,7 +59,7 @@ .I #CFGFILE# from this directory to .I $HOME/.#PACKAGE#/ -unless already it already exists in this location. +unless it already exists in this location. .I #CFGFILE# is a plain text file which can be modified, go wild! But don't be surprised if the game crahes ;) @@ -101,7 +101,7 @@ instead. .TP -[\fB\-d\fR|\fB\-\-dir\fR] \fIoutputfile +[\fB\-w\fR|\fB\-\-write\fR] \fIoutputfile Writes all game variables to a plain text file. .TP diff -Nru lierolibre-0.4/scripts/cross-compile lierolibre-0.5/scripts/cross-compile --- lierolibre-0.4/scripts/cross-compile 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/scripts/cross-compile 2012-11-08 21:02:14.000000000 +0000 @@ -0,0 +1,5 @@ +#!/bin/bash +./autogen.sh +./configure --enable-windows-includes --enable-windows-libraries --host=i686-w64-mingw32 --build=x86_64-unknown-linux-gnu +make distdir + diff -Nru lierolibre-0.4/scripts/lierolibre-cmd.bat lierolibre-0.5/scripts/lierolibre-cmd.bat --- lierolibre-0.4/scripts/lierolibre-cmd.bat 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/scripts/lierolibre-cmd.bat 2012-11-07 17:57:31.000000000 +0000 @@ -0,0 +1,5 @@ +@ECHO OFF +ECHO. +ECHO Available command-line options for lierolibre.exe: +lierolibre.exe -h +cmd /K diff -Nru lierolibre-0.4/scripts/lierolibre-packgfx lierolibre-0.5/scripts/lierolibre-packgfx --- lierolibre-0.4/scripts/lierolibre-packgfx 2012-05-03 13:50:28.000000000 +0000 +++ lierolibre-0.5/scripts/lierolibre-packgfx 2012-11-07 17:57:31.000000000 +0000 @@ -135,15 +135,15 @@ for i in $img1_header; do writedec "$i" done -convert "$inputfile1" -depth 8 gray:- >> "$outputfile" +convert "$inputfile1" -set colorspace Gray -depth 8 gray:- >> "$outputfile" for i in $img2_header; do writedec "$i" done -convert "$inputfile2" -depth 8 gray:- >> "$outputfile" +convert "$inputfile2" -set colorspace Gray -depth 8 gray:- >> "$outputfile" for i in $img3_header; do writedec "$i" done -convert "$inputfile3" -depth 8 gray:- >> "$outputfile" +convert "$inputfile3" -set colorspace Gray -depth 8 gray:- >> "$outputfile" diff -Nru lierolibre-0.4/scripts/lierolibre-packlev lierolibre-0.5/scripts/lierolibre-packlev --- lierolibre-0.4/scripts/lierolibre-packlev 2012-05-03 13:50:28.000000000 +0000 +++ lierolibre-0.5/scripts/lierolibre-packlev 2012-11-07 17:57:31.000000000 +0000 @@ -55,5 +55,5 @@ inputfile="$1" outputfile="$2" -convert "$inputfile" -depth 8 gray:- > "$outputfile" +convert "$inputfile" -set colorspace Gray -depth 8 gray:- > "$outputfile" diff -Nru lierolibre-0.4/scripts/lierolibre-packsounds lierolibre-0.5/scripts/lierolibre-packsounds --- lierolibre-0.4/scripts/lierolibre-packsounds 2012-05-03 13:50:28.000000000 +0000 +++ lierolibre-0.5/scripts/lierolibre-packsounds 2012-11-07 17:57:31.000000000 +0000 @@ -61,6 +61,7 @@ inputdir="$1" outputfile="$2" names="SHOTGUN SHOT RIFLE BAZOOKA BLASTER THROW LARPA EXP3A EXP3B EXP2 EXP3 EXP4 EXP5 DIRT BUMP DEATH1 DEATH2 DEATH3 HURT1 HURT2 HURT3 ALIVE BEGIN DROPSHEL RELOADED MOVEUP MOVEDOWN SELECT BOING BURNER" +LANG=C # relying on english output from dd for i in $names; do if [ ! -r "$inputdir"/"$i".wav ]; then @@ -151,7 +152,7 @@ dataoffset="$(($dataoffset + datasize))" datasize="$(sox -t wav "$file" \ -t raw -b 8 -e signed-integer -r 22050 -B -c 1 - | \ - dd 2>&1 | sed -n 's/\([0-9]*\)\ bytes\ .*/\1/p')" + dd 2>&1 >/dev/stdout | sed -n 's/\([0-9]*\)\ bytes\ .*/\1/p')" writestring $name $namesize writedec $dataoffset $offsetsize diff -Nru lierolibre-0.4/src/boostTesting.cpp lierolibre-0.5/src/boostTesting.cpp --- lierolibre-0.4/src/boostTesting.cpp 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/src/boostTesting.cpp 2012-11-07 17:57:31.000000000 +0000 @@ -0,0 +1,405 @@ +// Compile & run with: +// ~$ g++ -lboost_unit_test_framework -lboost_system -lboost_filesystem dataPath.o filesystem.o -oboosttest boostTesting.cpp && ./boosttest --loglevel=test_suite + +/* + * These are unit tests for dataPath. + * + * Copyright (c) 2012, Martin Erik Werner + * This software is released under the The BSD-2-Clause License: + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#define BOOST_TEST_DYN_LINK +#define BOOST_TEST_MODULE DataPath +#include +#include + +#include +#include +#include +#include +#include + +#include "dataPath.hpp" + +using namespace boost::filesystem; +using namespace std; + +string correct_message; + +bool test_exception_message(exception const& ex) { + return ex.what() == correct_message; +} + +struct DirectorySetup +{ + string template_string; + char c_temp_homedir[FILENAME_MAX]; + char c_temp_readonlydir[FILENAME_MAX]; + string temp_homedir; + string temp_readonlydir; + string temp_configdir; + string original_home; + + map file_access_map; + map::iterator file_access_pair; + vector names_rw; + fstream file; + string filepath; + DirectorySetup() + { +// cout << "begin DirectorySetup" << endl; + file_access_map.insert(pair("LIERO.EXE", + false)); + file_access_map.insert(pair("LIERO.CHR", + false)); + file_access_map.insert(pair("LIERO.SND", + false)); + file_access_map.insert(pair("NAMES.DAT", + false)); + file_access_map.insert(pair("LIERO.OPT", true)); + file_access_map.insert(pair("LIERO.DAT", true)); + file_access_map.insert(pair("liero.cfg", true)); + file_access_map.insert(pair("lierocfg.txt", true)); + + names_rw.push_back("LIERO.DAT"); + names_rw.push_back("liero.cfg"); + names_rw.push_back("lierocfg.txt"); + + template_string = "/tmp/liero_tmp_XXXXXX"; + strcpy(c_temp_homedir, template_string.c_str()); + strcpy(c_temp_readonlydir, template_string.c_str()); + + temp_homedir = mkdtemp(c_temp_homedir); + temp_readonlydir = mkdtemp(c_temp_readonlydir); + + original_home = getenv("HOME"); + setenv("HOME", temp_homedir.c_str(), 1); + } + + ~DirectorySetup() + { +// cout << "teardown DirectorySetup" << endl; + setenv("HOME", original_home.c_str(), 1); + remove_all(temp_homedir); + remove_all(temp_readonlydir); + } +}; + +struct ConfigdirSetup : DirectorySetup +{ + ConfigdirSetup() + { + temp_configdir = temp_homedir + '/' + ".lierolibre"; + + create_directory(temp_configdir); + } +}; + +struct FilesInReadonlySetup : virtual ConfigdirSetup +{ + FilesInReadonlySetup() + { +// cout << "begin FilesInReadonlySetup" << endl; + // create all files with content "readonly FILENAME" + for (file_access_pair = file_access_map.begin(); + file_access_pair != file_access_map.end(); + file_access_pair++) { + filepath = temp_readonlydir + '/' + + file_access_pair->first; + file.open(filepath.c_str(), ios::out); + if (file.is_open()) { + file << "readonly " + << file_access_pair->first << endl; + file.close(); + } else { + cout << "Can't write to file: " + << file << endl; + } + } + } + ~FilesInReadonlySetup() + { +// cout << "teardown FilesInReadonlySetup" << endl; + } +}; + +struct FilesInWritableSetup : virtual ConfigdirSetup +{ + FilesInWritableSetup() + { +// cout << "begin FilesInWritableSetup" << endl; + // create all writable files with content "writable FILENAME" + for (file_access_pair = file_access_map.begin(); + file_access_pair != file_access_map.end(); + file_access_pair++) { + if (file_access_pair->second) { + // file should be writable + filepath = temp_configdir + '/' + + file_access_pair->first; + file.open(filepath.c_str(), ios::out); + if(file.is_open()) { + file << "writable " + << file_access_pair->first + << endl; + file.close(); + } else { + cout << "Can't write to file: " + << file << endl; + } + } + } + } + ~FilesInWritableSetup() + { +// cout << "teardown FilesInWritableSetup" << endl; + } +}; + +struct AllFilesSetup : FilesInWritableSetup, FilesInReadonlySetup +{ + AllFilesSetup() + { +// cout << "begin AllFilesSetup" << endl; + } + ~AllFilesSetup() + { +// cout << "teardown AllFilesSetup" << endl; + } +}; + +BOOST_FIXTURE_TEST_CASE(configdir_exists__Path, ConfigdirSetup) +{ + DataPath data_path(temp_readonlydir); + + BOOST_CHECK_EQUAL(data_path.configdir(), temp_configdir); +} + +BOOST_FIXTURE_TEST_CASE(configdir_exists__CreateFile, ConfigdirSetup) +{ + string configfile_path; + fstream configfile; + DataPath data_path(temp_readonlydir); + + configfile_path = data_path.configdir() + '/' + "W"; + configfile.open(configfile_path.c_str(), ios::out); + BOOST_CHECK(configfile.is_open()); +} + +BOOST_FIXTURE_TEST_CASE(configdir_no_exists__CreateFile, DirectorySetup) +{ + string configfile_path; + fstream configfile; + DataPath data_path(temp_readonlydir); + + configfile_path = data_path.configdir() + '/' + "W"; + configfile.open(configfile_path.c_str(), ios::out); + BOOST_CHECK(configfile.is_open()); +} + +BOOST_FIXTURE_TEST_CASE(lieroexe_no_exists__Error, ConfigdirSetup) +{ + DataPath data_path(temp_readonlydir); + correct_message = "Could not open file '" + temp_readonlydir + '/' + + "LIERO.EXE" + "'"; + + BOOST_CHECK_EXCEPTION(throw data_path.file("LIERO.EXE"), + runtime_error, + test_exception_message); +} + +BOOST_FIXTURE_TEST_CASE(lieroexe_ro_exists__Path_Nocopy, FilesInReadonlySetup) +{ + string lieroexe_path; + string lieroexe_wrong_path; + fstream lieroexe_wrong; + DataPath data_path(temp_readonlydir); + + // test returned path + lieroexe_path = temp_readonlydir + '/' + "LIERO.EXE"; + BOOST_CHECK_EQUAL(data_path.file("LIERO.EXE"), lieroexe_path); + + // make sure it wasn't copied to configdir + lieroexe_wrong_path = temp_configdir + '/' + "LIERO.EXE"; + lieroexe_wrong.open(lieroexe_wrong_path.c_str(), ios::out|ios::in); + BOOST_CHECK(!lieroexe_wrong.is_open()); +} + +BOOST_FIXTURE_TEST_CASE(liero_rwfile_no_exists__Error, ConfigdirSetup) +{ + DataPath data_path(temp_readonlydir); + + for (int i = 0; i < names_rw.size(); ++i ) { + correct_message = "Could not open file '" + temp_configdir + '/' + names_rw.at(i) + "'"; + BOOST_CHECK_EXCEPTION(throw data_path.file(names_rw.at(i)), runtime_error, test_exception_message); + } +} + +BOOST_FIXTURE_TEST_CASE(liero_rwfile_ro_exists__Path_Writable_Contents, + FilesInReadonlySetup) +{ + for (int i = 0; i < names_rw.size(); ++i ) { + string path_ro; + string path_rw; + fstream f_rw; + fstream f_ro; + stringstream buf_ro; + stringstream buf_rw; + + // save readonly contents to buffer + path_ro = temp_readonlydir + '/' + names_rw.at(i); + f_ro.open(path_ro.c_str(), ios::in); + if (f_ro.is_open()) { + buf_ro << f_ro.rdbuf(); + f_ro.close(); + } else { + cout << "Can't read readonly '" + names_rw.at(i) + "'" << endl; + } + + DataPath data_path(temp_readonlydir); + + // test returned path + path_rw = temp_configdir + '/' + names_rw.at(i); + BOOST_CHECK_EQUAL(data_path.file(names_rw.at(i)), path_rw); + + // test if file is rw + f_rw.open(path_rw.c_str(), ios::out|ios::in); + BOOST_CHECK(f_rw.is_open()); + + if (f_rw.is_open()) { + buf_rw << f_rw.rdbuf(); + // convert both buffers to strings and compare + BOOST_CHECK_EQUAL(buf_ro.str(), buf_rw.str()); + f_rw.close(); + } else { + BOOST_ERROR("Cant open rw after copying"); + } + } +} + +BOOST_FIXTURE_TEST_CASE(liero_rwfile_exists__Path, FilesInWritableSetup) +{ + DataPath data_path(temp_readonlydir); + + for (int i = 0; i < names_rw.size(); ++i ) { + string path; + fstream f; + + // test returned path and if file is rw + path = temp_configdir + '/' + names_rw.at(i); + BOOST_CHECK_EQUAL(data_path.file(names_rw.at(i)), path); + f.open(path.c_str(), ios::out|ios::in); + BOOST_CHECK(f.is_open()); + } +} + +BOOST_FIXTURE_TEST_CASE(all_exists__NoOverwrite, AllFilesSetup) +{ + for (int i = 0; i < names_rw.size(); ++i ) { + string path_ro; + string path_rw; + fstream f_rw; + fstream f_ro; + stringstream buf_ro; + stringstream buf_rw; + stringstream buf; + string orig_content_ro; + string orig_content_rw; + + // save readonly file content + path_ro = temp_readonlydir + '/' + names_rw.at(i); + f_ro.open(path_ro.c_str(), ios::in); + if (f_ro.is_open()) { + buf << f_ro.rdbuf(); + f_ro.close(); + orig_content_ro = buf.str(); + // clear buffer + buf.str(""); + } else { + cout << "Can't read readonly '" + names_rw.at(i) + "'" << endl; + } + + // save writable file content + path_rw = temp_configdir + '/' + names_rw.at(i); + f_rw.open(path_rw.c_str(), ios::in); + if(f_rw.is_open()) { + buf << f_rw.rdbuf(); + f_rw.close(); + orig_content_rw = buf.str(); + // clear buffer + buf.str(""); + } else { + cout << "Can't read writable '" + names_rw.at(i) + "'" << endl; + } + + DataPath data_path(temp_readonlydir); + data_path.file(names_rw.at(i)); + + f_ro.open(path_ro.c_str(), ios::in); + if (f_ro.is_open()) { + buf << f_ro.rdbuf(); + f_ro.close(); + // check that file is unchanged + BOOST_CHECK_EQUAL(orig_content_ro, buf.str()); + // clear buffer + buf.str(""); + } else { + cout << "Can't read readonly '" + names_rw.at(i) + "'" << endl; + } + + f_rw.open(path_rw.c_str(), ios::in); + if (f_rw.is_open()) { + buf << f_rw.rdbuf(); + f_rw.close(); + // check that file is unchanged + BOOST_CHECK_EQUAL(orig_content_rw, buf.str()); + // clear buffer + buf.str(""); + } else { + cout << "Can't read writable '" + names_rw.at(i) + "'" << endl; + } + } +} + +BOOST_FIXTURE_TEST_CASE(all_exists__IncompleteFilename, AllFilesSetup) +{ + DataPath data_path(temp_readonlydir); + + correct_message = "Unknown file 'LIE'"; + + BOOST_CHECK_EXCEPTION(throw data_path.file("LIE"), + runtime_error, + test_exception_message); +} + +BOOST_FIXTURE_TEST_CASE(all_exists__AnyDatPath_AnyDatRw, AllFilesSetup) +{ + string meepdat_path; + fstream meepdat; + DataPath data_path(temp_readonlydir); + + // test returned path and if file is rw + meepdat_path = temp_configdir + '/' + "MEEP.DAT"; + BOOST_CHECK_EQUAL(data_path.file("MEEP.DAT"), meepdat_path); + meepdat.open(meepdat_path.c_str(), ios::out); + BOOST_CHECK(meepdat.is_open()); +} diff -Nru lierolibre-0.4/src/build-aux/compile lierolibre-0.5/src/build-aux/compile --- lierolibre-0.4/src/build-aux/compile 2012-06-11 22:59:54.000000000 +0000 +++ lierolibre-0.5/src/build-aux/compile 2012-11-15 21:03:11.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-01-04.17; # UTC +scriptversion=2012-03-05.13; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free # Software Foundation, Inc. @@ -79,6 +79,48 @@ esac } +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + # func_cl_wrapper cl arg... # Adjust compile command to suit cl func_cl_wrapper () @@ -109,43 +151,34 @@ ;; esac ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; -I*) func_file_conv "${1#-I}" mingw set x "$@" -I"$file" shift ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; -l*) - lib=${1#-l} - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - set x "$@" "$dir/$lib.dll.lib" - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - set x "$@" "$dir/$lib.lib" - break - fi - done - IFS=$save_IFS - - test "$found" != yes && set x "$@" "$lib.lib" + func_cl_dashl "${1#-l}" + set x "$@" "$lib" shift ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; -L*) - func_file_conv "${1#-L}" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" + func_cl_dashL "${1#-L}" ;; -static) shared=false diff -Nru lierolibre-0.4/src/build-aux/config.sub lierolibre-0.5/src/build-aux/config.sub --- lierolibre-0.4/src/build-aux/config.sub 2012-06-11 22:59:54.000000000 +0000 +++ lierolibre-0.5/src/build-aux/config.sub 2012-11-15 21:03:11.000000000 +0000 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -225,6 +225,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -1537,6 +1543,9 @@ c4x-* | tic4x-*) os=-coff ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; diff -Nru lierolibre-0.4/src/build-aux/depcomp lierolibre-0.5/src/build-aux/depcomp --- lierolibre-0.4/src/build-aux/depcomp 2012-06-11 22:59:54.000000000 +0000 +++ lierolibre-0.5/src/build-aux/depcomp 2012-11-15 21:03:11.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2012-03-27.16; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. # 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 @@ -28,7 +28,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,8 +40,8 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputting dependencies. @@ -57,6 +57,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -102,6 +108,12 @@ depmode=msvc7 fi +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -156,15 +168,14 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. @@ -203,18 +214,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -226,10 +234,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -259,12 +274,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -275,23 +289,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -300,15 +317,21 @@ exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -344,7 +367,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -359,9 +382,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -407,8 +430,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -443,11 +465,11 @@ p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/\(.*\)/ \1 \\/p +s/\(.*\)/'"$tab"'\1 \\/p s/.\(.*\) \\/\1:/ H $ { - s/.*/ / + s/.*/'"$tab"'/ G p }' >> "$depfile" @@ -478,7 +500,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -498,15 +520,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -562,8 +583,7 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -583,7 +603,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -652,8 +672,8 @@ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru lierolibre-0.4/src/build-aux/ltmain.sh lierolibre-0.5/src/build-aux/ltmain.sh --- lierolibre-0.4/src/build-aux/ltmain.sh 2012-06-11 22:59:50.000000000 +0000 +++ lierolibre-0.5/src/build-aux/ltmain.sh 2012-11-15 21:03:07.000000000 +0000 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.1 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1" +VERSION="2.4.2 Debian-2.4.2-1.1" TIMESTAMP="" package_revision=1.3337 diff -Nru lierolibre-0.4/src/dataPath.cpp lierolibre-0.5/src/dataPath.cpp --- lierolibre-0.4/src/dataPath.cpp 2012-05-03 13:50:28.000000000 +0000 +++ lierolibre-0.5/src/dataPath.cpp 2012-11-07 17:57:31.000000000 +0000 @@ -64,7 +64,7 @@ readonly_path = getRoot(a_readonly_path); #if GVL_WINDOWS - configdotdir = "settings"; + configdotdir = "user"; #else configdotdir = string(getenv("HOME")) + '/' + ".lierolibre"; #endif diff -Nru lierolibre-0.4/src/filesystem.cpp lierolibre-0.5/src/filesystem.cpp --- lierolibre-0.4/src/filesystem.cpp 2012-06-10 10:42:11.000000000 +0000 +++ lierolibre-0.5/src/filesystem.cpp 2012-11-13 19:56:04.000000000 +0000 @@ -1,7 +1,39 @@ /* - * Copyright (c) 2007-2010, Erik Lindroos - * Copyright (c) 2010, "basro" - * This software is released under the The BSD-2-Clause License: + * Copyright (c) 2001, Dietmar Kühl, under the Boost Software License, + * Version 1.0 + * Copyright (c) 2002, Beman Dawes, under the Boost Software License, + * Version 1.0 + * Copyright (c) 2007-2010, Erik Lindroos , under the + * BSD-2-Clause License + * Copyright (c) 2010, "basro", under the BSD-2-Clause License. + * + * + * Boost Software License - Version 1.0 - August 17th, 2003 + * + * Permission is hereby granted, free of charge, to any person or organization + * obtaining a copy of the software and accompanying documentation covered by + * this license (the "Software") to use, reproduce, display, distribute, + * execute, and transmit the Software, and to prepare derivative works of the + * Software, and to permit third-parties to whom the Software is furnished to + * do so, all subject to the following: + * + * The copyright notices in the Software and this entire statement, including + * the above license grant, this restriction and the following disclaimer, + * must be included in all copies of the Software, in whole or in part, and + * all derivative works of the Software, unless such copies or derivative + * works are solely in the form of machine-executable object code generated by + * a source language processor. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * + * BSD-2-Clause License: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -35,7 +67,7 @@ #include #include #if GVL_WINDOWS -#include // _mktemp_s() +#include // _mktemp(), _mktemp_s() #endif std::string changeLeaf(std::string const& path, std::string const& newLeaf) @@ -154,7 +186,10 @@ strcpy(tmpFileName, path.c_str()); strcat(tmpFileName, "_backup_XXXXXX"); -#if GVL_WINDOWS +#ifdef __MINGW32__ + // _mktemp_s was only very recently implemented for mingw-w64 + if (_mktemp(tmpFileName) == NULL) +#elif GVL_WINDOWS if (_mktemp_s(tmpFileName, strlen(tmpFileName) + 1) != 0) #else if (mkstemp(tmpFileName) == -1) diff -Nru lierolibre-0.4/src/filesystem.hpp lierolibre-0.5/src/filesystem.hpp --- lierolibre-0.4/src/filesystem.hpp 2012-06-10 10:42:11.000000000 +0000 +++ lierolibre-0.5/src/filesystem.hpp 2012-11-08 22:12:06.000000000 +0000 @@ -1,7 +1,41 @@ /* - * Copyright (c) 2007-2010, Erik Lindroos - * Copyright (c) 2010, "basro" - * This software is released under the The BSD-2-Clause License: + * Copyright (c) 2001, Dietmar Kühl, under the boost software license, + * version 1.0. + * Copyright (c) 2002, Jan Langer, under the boost software license, + * version 1.0. + * Copyright (c) 2002-2003, Beman Dawes, under the Boost Software License, + * Version 1.0. + * Copyright (c) 2007-2010, Erik Lindroos , under the + * BSD-2-Clause License + * Copyright (c) 2010, "basro", under the BSD-2-Clause License. + * + * + * Boost Software License - Version 1.0 - August 17th, 2003 + * + * Permission is hereby granted, free of charge, to any person or organization + * obtaining a copy of the software and accompanying documentation covered by + * this license (the "Software") to use, reproduce, display, distribute, + * execute, and transmit the Software, and to prepare derivative works of the + * Software, and to permit third-parties to whom the Software is furnished to + * do so, all subject to the following: + * + * The copyright notices in the Software and this entire statement, including + * the above license grant, this restriction and the following disclaimer, + * must be included in all copies of the Software, in whole or in part, and + * all derivative works of the Software, unless such copies or derivative + * works are solely in the form of machine-executable object code generated by + * a source language processor. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * + * BSD-2-Clause License: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff -Nru lierolibre-0.4/src/gfx.cpp lierolibre-0.5/src/gfx.cpp --- lierolibre-0.4/src/gfx.cpp 2012-05-03 13:50:28.000000000 +0000 +++ lierolibre-0.5/src/gfx.cpp 2012-11-08 13:48:35.000000000 +0000 @@ -357,8 +357,6 @@ hiddenMenu.addItem(MenuItem(48, 7, "Load replay...")); hiddenMenu.addItem(MenuItem(48, 7, "PowerLevel palettes")); hiddenMenu.addItem(MenuItem(48, 7, "Scaling filter")); - hiddenMenu.addItem(MenuItem(48, 7, "Fullscreen width")); - hiddenMenu.addItem(MenuItem(48, 7, "Fullscreen height")); hiddenMenu.addItem(MenuItem(48, 7, "TESTING 32-bit mode")); hiddenMenu.valueOffsetX = 100; } @@ -443,8 +441,6 @@ hiddenMenu.addItem(MenuItem(48, 7, "Load replay...")); hiddenMenu.addItem(MenuItem(48, 7, "PowerLevel palettes")); hiddenMenu.addItem(MenuItem(48, 7, "Scaling filter")); - hiddenMenu.addItem(MenuItem(48, 7, "Fullscreen width")); - hiddenMenu.addItem(MenuItem(48, 7, "Fullscreen height")); hiddenMenu.addItem(MenuItem(48, 7, "TESTING 32-bit mode")); hiddenMenu.valueOffsetX = 100; } @@ -1315,7 +1311,7 @@ void Gfx::updateExtensions(bool enabled) { - for(std::size_t i = HiddenMenu::Extensions + 1; i < HiddenMenu::FullscreenW; ++i) + for(std::size_t i = HiddenMenu::Extensions + 1; i < HiddenMenu::Depth32; ++i) { hiddenMenu.setVisibility(i, enabled); } diff -Nru lierolibre-0.4/src/gvl/_build/Gvl C++0x.props lierolibre-0.5/src/gvl/_build/Gvl C++0x.props --- lierolibre-0.4/src/gvl/_build/Gvl C++0x.props 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/src/gvl/_build/Gvl C++0x.props 2012-11-15 21:05:53.000000000 +0000 @@ -0,0 +1,12 @@ + + + + + + + + GVL_CPP0X=1;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff -Nru lierolibre-0.4/src/gvl/_build/Gvl IEEE SEE2.props lierolibre-0.5/src/gvl/_build/Gvl IEEE SEE2.props --- lierolibre-0.4/src/gvl/_build/Gvl IEEE SEE2.props 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/src/gvl/_build/Gvl IEEE SEE2.props 2012-11-15 21:05:53.000000000 +0000 @@ -0,0 +1,13 @@ + + + + + + + + StreamingSIMDExtensions2 + GVL_X87=0;GVL_FORCE_SSE2_FPU=1;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff -Nru lierolibre-0.4/src/gvl/_build/Gvl Standard Config.props lierolibre-0.5/src/gvl/_build/Gvl Standard Config.props --- lierolibre-0.4/src/gvl/_build/Gvl Standard Config.props 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/src/gvl/_build/Gvl Standard Config.props 2012-11-15 21:05:53.000000000 +0000 @@ -0,0 +1,16 @@ + + + + + + _bin\$(PlatformName)\$(Configuration)\ + _trash\$(PlatformName)\$(Configuration)\ + + + + _SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + $(IntDir)\%(Directory) + + + + \ No newline at end of file diff -Nru lierolibre-0.4/src/gvl/_build/Gvl_C++0x.props lierolibre-0.5/src/gvl/_build/Gvl_C++0x.props --- lierolibre-0.4/src/gvl/_build/Gvl_C++0x.props 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/src/gvl/_build/Gvl_C++0x.props 2012-06-17 10:15:06.000000000 +0000 @@ -0,0 +1,12 @@ + + + + + + + + GVL_CPP0X=1;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff -Nru lierolibre-0.4/src/gvl/_build/Gvl_IEEE_SEE2.props lierolibre-0.5/src/gvl/_build/Gvl_IEEE_SEE2.props --- lierolibre-0.4/src/gvl/_build/Gvl_IEEE_SEE2.props 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/src/gvl/_build/Gvl_IEEE_SEE2.props 2012-06-17 10:15:06.000000000 +0000 @@ -0,0 +1,13 @@ + + + + + + + + StreamingSIMDExtensions2 + GVL_X87=0;GVL_FORCE_SSE2_FPU=1;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff -Nru lierolibre-0.4/src/gvl/_build/Gvl_Standard_Config.props lierolibre-0.5/src/gvl/_build/Gvl_Standard_Config.props --- lierolibre-0.4/src/gvl/_build/Gvl_Standard_Config.props 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/src/gvl/_build/Gvl_Standard_Config.props 2012-06-17 10:15:06.000000000 +0000 @@ -0,0 +1,16 @@ + + + + + + _bin\$(PlatformName)\$(Configuration)\ + _trash\$(PlatformName)\$(Configuration)\ + + + + _SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + $(IntDir)\%(Directory) + + + + \ No newline at end of file diff -Nru lierolibre-0.4/src/gvl/_build/gvl.vcproj lierolibre-0.5/src/gvl/_build/gvl.vcproj --- lierolibre-0.4/src/gvl/_build/gvl.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/src/gvl/_build/gvl.vcproj 2012-06-17 10:15:06.000000000 +0000 @@ -0,0 +1,1633 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru lierolibre-0.4/src/gvl/_build/gvl.vcxproj lierolibre-0.5/src/gvl/_build/gvl.vcxproj --- lierolibre-0.4/src/gvl/_build/gvl.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/src/gvl/_build/gvl.vcxproj 2012-06-17 10:15:06.000000000 +0000 @@ -0,0 +1,378 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9} + gvl + + + + StaticLibrary + true + + + StaticLibrary + + + StaticLibrary + MultiByte + true + + + StaticLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + ..;..\..\..\lib;$(IncludePath) + ..\..\..\lib;$(IncludePath) + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + Level3 + EditAndContinue + + + true + + + ..\..\..\lib;%(AdditionalLibraryDirectories) + + + + + X64 + + + Disabled + _WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + Level3 + ProgramDatabase + true + + + + + MaxSpeed + AnySuitable + true + Speed + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + true + Level3 + ProgramDatabase + + + MachineX86 + + + + + X64 + + + MaxSpeed + true + _WIN64;_LIB;NDEBUG;%(PreprocessorDefinitions) + MultiThreaded + true + true + Level3 + ProgramDatabase + true + AnySuitable + Size + true + + + + + + + + + + + + + + false + false + false + false + + + + + + + + + + + true + + + true + true + + + + + + + + + true + true + true + true + + + + + false + false + false + false + + + false + false + false + false + + + + false + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + + + true + true + true + true + + + + + + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} + true + true + false + true + false + + + + + + \ No newline at end of file diff -Nru lierolibre-0.4/src/gvl/_build/gvl.vcxproj.filters lierolibre-0.5/src/gvl/_build/gvl.vcxproj.filters --- lierolibre-0.4/src/gvl/_build/gvl.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/src/gvl/_build/gvl.vcxproj.filters 2012-06-17 10:15:06.000000000 +0000 @@ -0,0 +1,527 @@ + + + + + {55cec4dd-3c9a-4c16-a330-9ae0e4b91bef} + + + {e11dc92c-cf10-4e5a-b6ce-8603988d10d6} + + + {c41c8202-dffd-4722-8a1e-11ab79b654e4} + + + {92d0d3a1-ae27-4906-861f-54ca9930e914} + + + {4b1584f8-7ad4-4695-8cef-f85647734331} + + + {a5c5508b-a34d-4126-94a6-25aedc20834c} + + + {19ecccd3-e7e4-4253-aaa8-b13fbc6d1d65} + + + {37e564b6-7826-4b3e-b193-052dd24cf7a6} + + + {3e900672-0e79-40bf-bc17-858f790ce831} + + + {8f2b2f49-5ca5-4ef2-95f8-56d92b07450d} + + + {b1fa008e-4fb0-44a3-9e33-7e966ce3db24} + + + {6ce3af90-9709-45ef-9bd6-82ce645e7ec0} + + + {97f9af1f-9489-401c-a222-0f74673e1596} + + + {3b487da1-cb03-4a27-8584-ff1140608dec} + + + {f49ece83-6500-49e0-8c78-abbf7e4843da} + + + {e25b10a9-00b5-4e21-8e25-864f1e721d50} + + + {12c28440-c648-4b57-8fbc-343a5203bd7c} + + + {4d8f82df-5bcd-453a-9520-f929eecb3eb5} + + + {baa86fe2-1718-4fba-aeed-7d84ec8bc342} + + + {90f4d4d5-7e10-4543-8f28-3bc11f6d66c9} + + + {5e8d8ef0-8fad-49c4-a527-f315f4a4ccca} + + + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + containers + + + containers + + + containers + + + resman + + + math + + + math + + + io + + + io + + + io + + + io + + + sockets + + + sockets + + + sockets + + + system + + + crypt + + + tut\quickcheck + + + containers\tests + + + test + + + containers\tests + + + containers\tests + + + containers\tests + + + io\tests + + + io\tests + + + support\tests + + + sockets + + + text + + + containers\tests + + + system + + + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + support + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers + + + containers\trees + + + resman + + + resman + + + resman + + + resman + + + resman + + + resman + + + resman + + + resman + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + io + + + io + + + io + + + io + + + io + + + io + + + io + + + io + + + io + + + sockets + + + sockets + + + sockets + + + system + + + containers\trees + + + crypt + + + crypt + + + crypt + + + text + + + serialization + + + serialization + + + serialization + + + tut\quickcheck + + + tut\quickcheck + + + tut\quickcheck + + + tut\quickcheck + + + meta + + + meta + + + meta + + + meta + + + + + + + containers + + + + + io + + + io + + + io + + + io + + + test + + + io + + + test + + + sockets + + + text + + + system + + + hash_set + + + hash_set + + + support + + + system + + + system + + + + + containers + + + io + + + io + + + io + + + io + + + sockets + + + \ No newline at end of file diff -Nru lierolibre-0.4/src/keys.cpp lierolibre-0.5/src/keys.cpp --- lierolibre-0.4/src/keys.cpp 2012-05-03 13:50:28.000000000 +0000 +++ lierolibre-0.5/src/keys.cpp 2012-11-07 17:58:01.000000000 +0000 @@ -138,6 +138,8 @@ std::map::iterator i = SDLToDOSScanCodes.find(Uint32(key)); if(i != SDLToDOSScanCodes.end()) return i->second; + if(key == 313) + return 144; // RALT falls outside of map on *nix, special-cased for now return 89; } diff -Nru lierolibre-0.4/src/lfs.hpp lierolibre-0.5/src/lfs.hpp --- lierolibre-0.4/src/lfs.hpp 2012-05-03 13:50:28.000000000 +0000 +++ lierolibre-0.5/src/lfs.hpp 2012-11-08 22:09:06.000000000 +0000 @@ -1,6 +1,35 @@ /* - * Copyright (c) 2007-2010, Erik Lindroos - * This software is released under the The BSD-2-Clause License: + * Copyright (c) 2002, Jens Maurer under the Boost Software License, Version 1.0 + * Copyright (c) 2007-2010, Erik Lindroos under the + * BSD-2-Clause License + * + * + * Boost Software License - Version 1.0 - August 17th, 2003 + * + * Permission is hereby granted, free of charge, to any person or organization + * obtaining a copy of the software and accompanying documentation covered by + * this license (the "Software") to use, reproduce, display, distribute, + * execute, and transmit the Software, and to prepare derivative works of the + * Software, and to permit third-parties to whom the Software is furnished to + * do so, all subject to the following: + * + * The copyright notices in the Software and this entire statement, including + * the above license grant, this restriction and the following disclaimer, + * must be included in all copies of the Software, in whole or in part, and + * all derivative works of the Software, unless such copies or derivative + * works are solely in the form of machine-executable object code generated by + * a source language processor. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * + * BSD-2-Clause License: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff -Nru lierolibre-0.4/src/m4/libtool.m4 lierolibre-0.5/src/m4/libtool.m4 --- lierolibre-0.4/src/m4/libtool.m4 2012-06-11 22:59:50.000000000 +0000 +++ lierolibre-0.5/src/m4/libtool.m4 2012-11-15 21:03:07.000000000 +0000 @@ -2512,17 +2512,6 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2639,7 +2628,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -3255,10 +3244,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3297,7 +3282,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -4049,7 +4034,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4348,7 +4333,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -6241,9 +6226,6 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6405,7 +6387,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff -Nru lierolibre-0.4/src/m4/sdl.m4 lierolibre-0.5/src/m4/sdl.m4 --- lierolibre-0.4/src/m4/sdl.m4 2012-04-25 22:37:26.000000000 +0000 +++ lierolibre-0.5/src/m4/sdl.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,185 +0,0 @@ -# Configure paths for SDL -# Sam Lantinga 9/21/99 -# stolen from Manish Singh -# stolen back from Frank Belew -# stolen from Manish Singh -# Shamelessly stolen from Owen Taylor - -# serial 1 - -dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS -dnl -AC_DEFUN([AM_PATH_SDL], -[dnl -dnl Get the cflags and libraries from the sdl-config script -dnl -AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], - sdl_prefix="$withval", sdl_prefix="") -AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], - sdl_exec_prefix="$withval", sdl_exec_prefix="") -AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], - , enable_sdltest=yes) - - if test x$sdl_exec_prefix != x ; then - sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config - fi - fi - if test x$sdl_prefix != x ; then - sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" - if test x${SDL_CONFIG+set} != xset ; then - SDL_CONFIG=$sdl_prefix/bin/sdl-config - fi - fi - - as_save_PATH="$PATH" - if test "x$prefix" != xNONE; then - PATH="$prefix/bin:$prefix/usr/bin:$PATH" - fi - AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) - PATH="$as_save_PATH" - min_sdl_version=ifelse([$1], ,0.11.0,$1) - AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) - no_sdl="" - if test "$SDL_CONFIG" = "no" ; then - no_sdl=yes - else - SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` - SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` - - sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_sdltest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $SDL_CFLAGS" - CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" -dnl -dnl Now check if the installed SDL is sufficiently new. (Also sanity -dnl checks the results of sdl-config to some extent -dnl - rm -f conf.sdltest - AC_TRY_RUN([ -#include -#include -#include -#include "SDL.h" - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (int argc, char *argv[]) -{ - int major, minor, micro; - char *tmp_version; - - /* This hangs on some systems (?) - system ("touch conf.sdltest"); - */ - { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_sdl_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_sdl_version"); - exit(1); - } - - if (($sdl_major_version > major) || - (($sdl_major_version == major) && ($sdl_minor_version > minor)) || - (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); - printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); - printf("*** to point to the correct copy of sdl-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_sdl" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$SDL_CONFIG" = "no" ; then - echo "*** The sdl-config script installed by SDL could not be found" - echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the SDL_CONFIG environment variable to the" - echo "*** full path to sdl-config." - else - if test -f conf.sdltest ; then - : - else - echo "*** Could not run SDL test program, checking why..." - CFLAGS="$CFLAGS $SDL_CFLAGS" - CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - AC_TRY_LINK([ -#include -#include "SDL.h" - -int main(int argc, char *argv[]) -{ return 0; } -#undef main -#define main K_and_R_C_main -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding SDL or finding the wrong" - echo "*** version of SDL. If it is not finding SDL, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means SDL was incorrectly installed" - echo "*** or that you have moved SDL since it was installed. In the latter case, you" - echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - SDL_CFLAGS="" - SDL_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(SDL_CFLAGS) - AC_SUBST(SDL_LIBS) - rm -f conf.sdltest -]) diff -Nru lierolibre-0.4/src/menu/hiddenMenu.cpp lierolibre-0.5/src/menu/hiddenMenu.cpp --- lierolibre-0.4/src/menu/hiddenMenu.cpp 2012-05-03 13:50:28.000000000 +0000 +++ lierolibre-0.5/src/menu/hiddenMenu.cpp 2012-11-07 17:57:31.000000000 +0000 @@ -100,10 +100,6 @@ return new BooleanSwitchBehavior(common, gfx.settings->loadPowerlevelPalette); case ScalingFilter: return new ArrayEnumBehavior(common, gfx.settings->scaleFilter, scaleFilterNames); - case FullscreenW: - return new IntegerBehavior(common, gfx.settings->fullscreenW, 0, 9999, 0); - case FullscreenH: - return new IntegerBehavior(common, gfx.settings->fullscreenH, 0, 9999, 0); case Depth32: return new Depth32Behavior(common, gfx.settings->depth32); default: diff -Nru lierolibre-0.4/src/menu/hiddenMenu.hpp lierolibre-0.5/src/menu/hiddenMenu.hpp --- lierolibre-0.4/src/menu/hiddenMenu.hpp 2012-05-03 13:50:28.000000000 +0000 +++ lierolibre-0.5/src/menu/hiddenMenu.hpp 2012-11-07 17:57:31.000000000 +0000 @@ -41,8 +41,6 @@ Replays, LoadPowerLevels, ScalingFilter, - FullscreenW, - FullscreenH, Depth32 }; diff -Nru lierolibre-0.4/src/settings.cpp lierolibre-0.5/src/settings.cpp --- lierolibre-0.4/src/settings.cpp 2012-05-03 13:50:28.000000000 +0000 +++ lierolibre-0.5/src/settings.cpp 2012-11-07 17:57:32.000000000 +0000 @@ -80,8 +80,6 @@ , scaleFilter(Settings::SfNearest) , depth32(true) , bloodParticleMax(700) -, fullscreenW(640) -, fullscreenH(480) { } @@ -113,7 +111,7 @@ unsigned char defControls[2][7] = { {0x13, 0x21, 0x20, 0x22, 0x1D, 0x2A, 0x38}, - {0xA0, 0xA8, 0xA3, 0xA5, 0x75, 0x90, 0x36} + {0xA0, 0xA8, 0xA3, 0xA5, 0x75, 0x59, 0x36} }; unsigned char defRGB[2][3] = @@ -153,6 +151,22 @@ archive_liero(gvl::in_archive(reader, context), *this); + unsigned char defControlsEx[2][8] = + { + {0x13, 0x21, 0x20, 0x22, 0x1D, 0x2A, 0x38, 0x56}, + {0xA0, 0xA8, 0xA3, 0xA5, 0x75, 0x59, 0x36, 0x0C} + }; + + for(int i = 0; i < 2; ++i) + { + for(int j = 0; j < 7; ++j) + { + if(!wormSettings[i]->controlsEx[j]) + wormSettings[i]->controlsEx[j] = (wormSettings[i]->controls[j] ? wormSettings[i]->controls[j] : defControlsEx[i][j]); + } + if(!wormSettings[i]->controlsEx[7]) + wormSettings[i]->controlsEx[7] = defControlsEx[i][7]; + } return true; } diff -Nru lierolibre-0.4/src/settings.hpp lierolibre-0.5/src/settings.hpp --- lierolibre-0.4/src/settings.hpp 2012-05-03 13:50:28.000000000 +0000 +++ lierolibre-0.5/src/settings.hpp 2012-11-07 17:57:32.000000000 +0000 @@ -52,9 +52,6 @@ uint32_t scaleFilter; bool depth32; int bloodParticleMax; - - int fullscreenW; - int fullscreenH; }; struct Settings : gvl::shared, Extensions @@ -250,8 +247,6 @@ ar.b(settings.recordReplays); ar.b(settings.loadPowerlevelPalette); ar.ui8(settings.scaleFilter); - ar.ui16(settings.fullscreenW); - ar.ui16(settings.fullscreenH); gvl::enable_when(ar, fileExtensionVersion >= 2) .b(settings.depth32, true); @@ -326,9 +321,7 @@ .b(settings.extensions) .b(settings.recordReplays) .b(settings.loadPowerlevelPalette) - .ui8(settings.scaleFilter) - .ui16(settings.fullscreenW) - .ui16(settings.fullscreenH); + .ui8(settings.scaleFilter); gvl::enable_when(ar, fileExtensionVersion >= 2) .b(settings.depth32, true); diff -Nru lierolibre-0.4/src/weapsel.cpp lierolibre-0.5/src/weapsel.cpp --- lierolibre-0.4/src/weapsel.cpp 2012-05-03 13:50:28.000000000 +0000 +++ lierolibre-0.5/src/weapsel.cpp 2012-11-07 17:57:32.000000000 +0000 @@ -59,7 +59,7 @@ Worm& worm = *vp.worm; WormSettings& ws = *worm.settings; - menus[i].items.push_back(MenuItem(1, 1, common.texts.randomize)); + menus[i].items.push_back(MenuItem(60, 60, common.texts.randomize)); { int x = vp.rect.center_x() - 31; diff -Nru lierolibre-0.4/windows/visualC/liero.vcproj lierolibre-0.5/windows/visualC/liero.vcproj --- lierolibre-0.4/windows/visualC/liero.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/windows/visualC/liero.vcproj 2012-11-09 17:23:48.000000000 +0000 @@ -0,0 +1,841 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru lierolibre-0.4/windows/visualC/liero.vcxproj lierolibre-0.5/windows/visualC/liero.vcxproj --- lierolibre-0.4/windows/visualC/liero.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/windows/visualC/liero.vcxproj 2012-11-11 14:14:07.000000000 +0000 @@ -0,0 +1,270 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {CDE258F8-90DB-407B-8521-AA531EE4D167} + liero + Win32Proj + lierolibre + + + + Application + MultiByte + + + Application + MultiByte + + + Application + + + Application + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)\..\_bin\$(Configuration)\ + _trash\$(Configuration)\ + true + $(SolutionDir)\..\_bin\$(Configuration)\ + _trash\$(Configuration)\ + false + ..\include;..\..\src;$(IncludePath) + ..\include;..\..\src;$(IncludePath) + + + + Disabled + $(VCInstallDir)\include\SDL;$(SolutionDir)\..;%(AdditionalIncludeDirectories) + LIBCONFIGXX_STATIC;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level1 + EditAndContinue + + + + + $(OutDir)lierolibre.exe + true + $(OutDir)liero.pdb + Console + false + + + MachineX86 + + + false + + + + + Full + AnySuitable + true + Speed + true + $(VCInstallDir)\include\SDL;$(SolutionDir)\..;%(AdditionalIncludeDirectories) + LIBCONFIGXX_STATIC;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;DISABLE_MAINHACK;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + /D BOOST_ALL_DYN_LINK %(AdditionalOptions) + + + %(AdditionalDependencies) + $(OutDir)lierolibre.exe + true + Console + true + true + UseLinkTimeCodeGeneration + false + + + MachineX86 + + + + + + + + + + + {a0c36ce7-d908-4573-8b69-249eeeb7d2be} + + + {81ce8daf-ebb2-4761-8e45-b71abcca8c68} + + + {57addf43-2fac-4c85-8d88-72dee580a3c9} + + + {8fd826f8-3739-44e6-8cc8-997122e53b8d} + + + {6088541b-a9e1-461b-b83a-8eb6ec1c274e} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru lierolibre-0.4/windows/visualC/lierolibre.sln lierolibre-0.5/windows/visualC/lierolibre.sln --- lierolibre-0.4/windows/visualC/lierolibre.sln 1970-01-01 00:00:00.000000000 +0000 +++ lierolibre-0.5/windows/visualC/lierolibre.sln 2012-11-11 14:14:07.000000000 +0000 @@ -0,0 +1,112 @@ +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lierolibre", "liero.vcxproj", "{CDE258F8-90DB-407B-8521-AA531EE4D167}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvl", "..\..\src\gvl\_build\gvl.vcxproj", "{57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconfig++", "..\libconfig-1.4.8\lib\libconfig++.vcxproj", "{A0C36CE7-D908-4573-8B69-249EEEB7D2BE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "..\SDL-1.2.15\VisualC\SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost_program_options", "boost.vcxproj", "{6088541B-A9E1-461B-B83A-8EB6EC1C274E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "..\zlib-1.2.7\contrib\vstudio\vc10\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Itanium = Debug|Itanium + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Itanium = Release|Itanium + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium + ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32 + ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CDE258F8-90DB-407B-8521-AA531EE4D167}.Debug|Itanium.ActiveCfg = Debug|x64 + {CDE258F8-90DB-407B-8521-AA531EE4D167}.Debug|Win32.ActiveCfg = Debug|Win32 + {CDE258F8-90DB-407B-8521-AA531EE4D167}.Debug|Win32.Build.0 = Debug|Win32 + {CDE258F8-90DB-407B-8521-AA531EE4D167}.Debug|x64.ActiveCfg = Debug|x64 + {CDE258F8-90DB-407B-8521-AA531EE4D167}.Debug|x64.Build.0 = Debug|x64 + {CDE258F8-90DB-407B-8521-AA531EE4D167}.Release|Itanium.ActiveCfg = Release|x64 + {CDE258F8-90DB-407B-8521-AA531EE4D167}.Release|Win32.ActiveCfg = Release|Win32 + {CDE258F8-90DB-407B-8521-AA531EE4D167}.Release|Win32.Build.0 = Release|Win32 + {CDE258F8-90DB-407B-8521-AA531EE4D167}.Release|x64.ActiveCfg = Release|Win32 + {CDE258F8-90DB-407B-8521-AA531EE4D167}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|x64 + {CDE258F8-90DB-407B-8521-AA531EE4D167}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {CDE258F8-90DB-407B-8521-AA531EE4D167}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {CDE258F8-90DB-407B-8521-AA531EE4D167}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {CDE258F8-90DB-407B-8521-AA531EE4D167}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.Debug|Itanium.ActiveCfg = Debug|x64 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.Debug|Win32.Build.0 = Debug|Win32 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.Debug|x64.ActiveCfg = Debug|x64 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.Debug|x64.Build.0 = Debug|x64 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.Release|Itanium.ActiveCfg = Release|x64 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.Release|Win32.ActiveCfg = Release|Win32 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.Release|Win32.Build.0 = Release|Win32 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.Release|x64.ActiveCfg = Release|x64 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.Release|x64.Build.0 = Release|x64 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|x64 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {57ADDF43-2FAC-4C85-8D88-72DEE580A3C9}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {A0C36CE7-D908-4573-8B69-249EEEB7D2BE}.Debug|Itanium.ActiveCfg = Debug|Win32 + {A0C36CE7-D908-4573-8B69-249EEEB7D2BE}.Debug|Win32.ActiveCfg = Debug|Win32 + {A0C36CE7-D908-4573-8B69-249EEEB7D2BE}.Debug|Win32.Build.0 = Debug|Win32 + {A0C36CE7-D908-4573-8B69-249EEEB7D2BE}.Debug|x64.ActiveCfg = Debug|Win32 + {A0C36CE7-D908-4573-8B69-249EEEB7D2BE}.Release|Itanium.ActiveCfg = Release|Win32 + {A0C36CE7-D908-4573-8B69-249EEEB7D2BE}.Release|Win32.ActiveCfg = Release|Win32 + {A0C36CE7-D908-4573-8B69-249EEEB7D2BE}.Release|Win32.Build.0 = Release|Win32 + {A0C36CE7-D908-4573-8B69-249EEEB7D2BE}.Release|x64.ActiveCfg = Release|Win32 + {A0C36CE7-D908-4573-8B69-249EEEB7D2BE}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32 + {A0C36CE7-D908-4573-8B69-249EEEB7D2BE}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {A0C36CE7-D908-4573-8B69-249EEEB7D2BE}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {A0C36CE7-D908-4573-8B69-249EEEB7D2BE}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Itanium.ActiveCfg = Debug|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Itanium.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {6088541B-A9E1-461B-B83A-8EB6EC1C274E}.Debug|Itanium.ActiveCfg = Debug|Win32 + {6088541B-A9E1-461B-B83A-8EB6EC1C274E}.Debug|Win32.ActiveCfg = Debug|Win32 + {6088541B-A9E1-461B-B83A-8EB6EC1C274E}.Debug|Win32.Build.0 = Debug|Win32 + {6088541B-A9E1-461B-B83A-8EB6EC1C274E}.Debug|x64.ActiveCfg = Debug|Win32 + {6088541B-A9E1-461B-B83A-8EB6EC1C274E}.Release|Itanium.ActiveCfg = Release|Win32 + {6088541B-A9E1-461B-B83A-8EB6EC1C274E}.Release|Win32.ActiveCfg = Release|Win32 + {6088541B-A9E1-461B-B83A-8EB6EC1C274E}.Release|Win32.Build.0 = Release|Win32 + {6088541B-A9E1-461B-B83A-8EB6EC1C274E}.Release|x64.ActiveCfg = Release|Win32 + {6088541B-A9E1-461B-B83A-8EB6EC1C274E}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32 + {6088541B-A9E1-461B-B83A-8EB6EC1C274E}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {6088541B-A9E1-461B-B83A-8EB6EC1C274E}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {6088541B-A9E1-461B-B83A-8EB6EC1C274E}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal