From 092e2c4f3c63b7ada368a927a6eee1b4dc9fdaaa Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 25 Jan 2008 17:37:48 +0000 Subject: Rename some files to be package name independent. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1024 --- setup/Makefile.am | 6 +- setup/chocolate-setup-res.rc.in | 22 ---- setup/chocolate_setup_icon.c | 262 ---------------------------------------- setup/execute.c | 5 +- setup/mainmenu.c | 10 +- setup/setup-res.rc.in | 22 ++++ setup/setup_icon.c | 262 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 295 insertions(+), 294 deletions(-) delete mode 100644 setup/chocolate-setup-res.rc.in delete mode 100644 setup/chocolate_setup_icon.c create mode 100644 setup/setup-res.rc.in create mode 100644 setup/setup_icon.c (limited to 'setup') diff --git a/setup/Makefile.am b/setup/Makefile.am index 10085218..670d8cde 100644 --- a/setup/Makefile.am +++ b/setup/Makefile.am @@ -23,10 +23,10 @@ SOURCE_FILES = \ txt_mouseinput.c txt_mouseinput.h EXTRA_DIST= \ - chocolate_setup_icon.c + setup_icon.c if HAVE_WINDRES -chocolate_setup_SOURCES=$(SOURCE_FILES) chocolate-setup-res.rc +chocolate_setup_SOURCES=$(SOURCE_FILES) setup-res.rc else chocolate_setup_SOURCES=$(SOURCE_FILES) endif @@ -38,7 +38,7 @@ endif if HAVE_PYTHON -chocolate_setup_icon.c : ../data/chocolate-setup.png +setup_icon.c : ../data/setup.png ../data/convert-icon $^ $@ endif diff --git a/setup/chocolate-setup-res.rc.in b/setup/chocolate-setup-res.rc.in deleted file mode 100644 index cb49a1b2..00000000 --- a/setup/chocolate-setup-res.rc.in +++ /dev/null @@ -1,22 +0,0 @@ -1 ICON "..\\data\\chocolate-setup.ico" - -1 VERSIONINFO -PRODUCTVERSION @WINDOWS_RC_VERSION@ -FILEVERSION @WINDOWS_RC_VERSION@ -FILETYPE 1 -{ - BLOCK "StringFileInfo" - { - BLOCK "040904E4" - { - VALUE "FileVersion", "@PACKAGE_VERSION@" - VALUE "FileDescription", "@PACKAGE_STRING@ Setup" - VALUE "InternalName", "@PACKAGE_TARNAME@" - VALUE "CompanyName", "@PACKAGE_BUGREPORT@" - VALUE "LegalCopyright", "GNU General Public License" - VALUE "ProductName", "@PACKAGE_NAME@ Setup" - VALUE "ProductVersion", "@PACKAGE_VERSION@" - } - } -} - diff --git a/setup/chocolate_setup_icon.c b/setup/chocolate_setup_icon.c deleted file mode 100644 index 57270950..00000000 --- a/setup/chocolate_setup_icon.c +++ /dev/null @@ -1,262 +0,0 @@ -static int chocolate_setup_w = 32; -static int chocolate_setup_h = 32; - -static unsigned char chocolate_setup_data[] = { - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, - 0x6b,0x31,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x6b,0x31,0x00, - 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0x6b,0x31,0x00, 0x94,0x52,0x00, 0xad,0x5a,0x00, - 0x6b,0x31,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x6b,0x31,0x00, - 0x94,0x52,0x00, 0xad,0x5a,0x00, 0x6b,0x31,0x00, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, - 0x6b,0x31,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x6b,0x31,0x00, - 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, - 0x6b,0x31,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x6b,0x31,0x00, - 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0x6b,0x31,0x00, 0x94,0x52,0x00, 0xad,0x5a,0x00, - 0x6b,0x31,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x6b,0x31,0x00, - 0x94,0x52,0x00, 0xad,0x5a,0x00, 0x6b,0x31,0x00, 0x52,0x29,0x00, - 0x52,0x29,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, - 0xb5,0xb5,0xb5, 0xc6,0xc6,0xc6, 0x6b,0x31,0x00, 0xc6,0xc6,0xc6, - 0xb5,0xb5,0xb5, 0x52,0x29,0x00, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, - 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, - 0xb5,0xb5,0xb5, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, - 0xb5,0xb5,0xb5, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0xc6,0xc6,0xc6, - 0xb5,0xb5,0xb5, 0xb5,0xb5,0xb5, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, - 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0xb5,0xb5,0xb5, - 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x84,0x00,0x00, - 0xc6,0x00,0x00, 0xc6,0x00,0x00, 0x84,0x00,0x00, 0xc6,0x00,0x00, - 0x84,0x00,0x00, 0x84,0x00,0x00, 0xc6,0x00,0x00, 0xc6,0x00,0x00, - 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, - 0x84,0x00,0x00, 0x84,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x42,0x00,0x00, - 0x42,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, - 0x84,0x00,0x00, 0x42,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, - 0x42,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, - 0x42,0x00,0x00, 0x84,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x42,0x00,0x00, - 0x84,0x00,0x00, 0x42,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, - 0x84,0x00,0x00, 0x42,0x00,0x00, 0x52,0x29,0x00, 0x42,0x00,0x00, - 0x6b,0x31,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, - 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x42,0x00,0x00, - 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, - 0x42,0x00,0x00, 0x42,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, - 0x84,0x00,0x00, 0x00,0x00,0x00, 0xb5,0xb5,0xb5, 0x42,0x42,0x42, - 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0xb5,0xb5,0xb5, 0x00,0x00,0x00, - 0x00,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x42,0x00,0x00, - 0x84,0x00,0x00, 0x42,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, - 0x84,0x00,0x00, 0x42,0x00,0x00, 0xc6,0x00,0x00, 0x42,0x00,0x00, - 0xc6,0x00,0x00, 0x42,0x00,0x00, 0x00,0x00,0x00, 0xc6,0xc6,0xc6, - 0x42,0x42,0x42, 0x42,0x42,0x42, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, - 0xb5,0xb5,0xb5, 0x00,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x42,0x00,0x00, - 0x42,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, - 0x84,0x00,0x00, 0x42,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, - 0x00,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x00,0x00,0x00, - 0x00,0x00,0x00, 0xc6,0xc6,0xc6, 0x42,0x42,0x42, 0xff,0xff,0xff, - 0xb5,0xb5,0xb5, 0x00,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x84,0x00,0x00, - 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, - 0x84,0x00,0x00, 0xff,0xff,0xff, 0x00,0x00,0x00, 0xff,0xff,0xff, - 0xb5,0xb5,0xb5, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x84,0x00,0x00, - 0x84,0x00,0x00, 0x00,0x00,0x00, 0x42,0x42,0x42, 0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0x00,0x00,0x00, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, - 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, - 0x84,0x00,0x00, 0x84,0x00,0x00, 0x00,0x00,0x00, 0xff,0xff,0xff, - 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0x00,0x00,0x00, - 0x42,0x42,0x42, 0x42,0x42,0x42, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0x00,0x00,0x00, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, - 0x84,0x00,0x00, 0x84,0x00,0x00, 0x00,0x00,0x00, 0x42,0x42,0x42, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xff,0xff,0xff, - 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, - 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0x00,0x00,0x00, - 0x00,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0x42,0x42,0x42, 0xff,0xff,0xff, - 0x42,0x42,0x42, 0x42,0x42,0x42, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xff,0xff,0xff, - 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, - 0xb5,0xb5,0xb5, 0x00,0x00,0x00, 0x00,0x00,0x00, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0x00,0x00,0x00, 0xc6,0xc6,0xc6, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0x42,0x42,0x42, 0x42,0x42,0x42, - 0x42,0x42,0x42, 0x42,0x42,0x42, 0xb5,0xb5,0xb5, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0xff,0xff,0xff, 0x00,0x00,0x00, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x00,0x00,0x00, - 0x00,0x00,0x00, 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0x42,0x42,0x42, 0x42,0x42,0x42, - 0x42,0x42,0x42, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, - 0xb5,0xb5,0xb5, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, - 0xb5,0xb5,0xb5, 0x42,0x42,0x42, 0x42,0x42,0x42, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0x42,0x42,0x42, - 0x42,0x42,0x42, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0x00,0x00,0x00, 0x00,0x00,0x00, - 0x00,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, - 0xb5,0xb5,0xb5, 0x42,0x42,0x42, 0x42,0x42,0x42, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0x42,0x42,0x42, 0x42,0x42,0x42, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0x00,0x00,0x00, 0x00,0x00,0x00, - 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, - -}; diff --git a/setup/execute.c b/setup/execute.c index 39fd5958..b5b8a7c6 100644 --- a/setup/execute.c +++ b/setup/execute.c @@ -37,14 +37,15 @@ #include "textscreen.h" +#include "config.h" #include "configfile.h" #include "execute.h" #include "m_argv.h" #ifdef _WIN32 -#define DOOM_BINARY "chocolate-doom.exe" +#define DOOM_BINARY PACKAGE_TARNAME ".exe" #else -#define DOOM_BINARY INSTALL_DIR "/chocolate-doom" +#define DOOM_BINARY INSTALL_DIR "/" PACKAGE_TARNAME #endif #ifdef _WIN32 diff --git a/setup/mainmenu.c b/setup/mainmenu.c index 71643400..335bd61b 100644 --- a/setup/mainmenu.c +++ b/setup/mainmenu.c @@ -28,7 +28,7 @@ #include "configfile.h" #include "m_argv.h" -#include "chocolate_setup_icon.c" +#include "setup_icon.c" #include "compatibility.h" #include "display.h" @@ -152,11 +152,11 @@ static void SetIcon(void) { SDL_Surface *surface; - surface = SDL_CreateRGBSurfaceFrom(chocolate_setup_data, - chocolate_setup_w, - chocolate_setup_h, + surface = SDL_CreateRGBSurfaceFrom(setup_icon_data, + setup_icon_w, + setup_icon_h, 24, - chocolate_setup_w * 3, + setup_icon_w * 3, 0xff << 0, 0xff << 8, 0xff << 16, diff --git a/setup/setup-res.rc.in b/setup/setup-res.rc.in new file mode 100644 index 00000000..cb49a1b2 --- /dev/null +++ b/setup/setup-res.rc.in @@ -0,0 +1,22 @@ +1 ICON "..\\data\\chocolate-setup.ico" + +1 VERSIONINFO +PRODUCTVERSION @WINDOWS_RC_VERSION@ +FILEVERSION @WINDOWS_RC_VERSION@ +FILETYPE 1 +{ + BLOCK "StringFileInfo" + { + BLOCK "040904E4" + { + VALUE "FileVersion", "@PACKAGE_VERSION@" + VALUE "FileDescription", "@PACKAGE_STRING@ Setup" + VALUE "InternalName", "@PACKAGE_TARNAME@" + VALUE "CompanyName", "@PACKAGE_BUGREPORT@" + VALUE "LegalCopyright", "GNU General Public License" + VALUE "ProductName", "@PACKAGE_NAME@ Setup" + VALUE "ProductVersion", "@PACKAGE_VERSION@" + } + } +} + diff --git a/setup/setup_icon.c b/setup/setup_icon.c new file mode 100644 index 00000000..23459716 --- /dev/null +++ b/setup/setup_icon.c @@ -0,0 +1,262 @@ +static int setup_icon_w = 32; +static int setup_icon_h = 32; + +static unsigned char setup_icon_data[] = { + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, + 0x6b,0x31,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x6b,0x31,0x00, + 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0x6b,0x31,0x00, 0x94,0x52,0x00, 0xad,0x5a,0x00, + 0x6b,0x31,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x6b,0x31,0x00, + 0x94,0x52,0x00, 0xad,0x5a,0x00, 0x6b,0x31,0x00, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, + 0x6b,0x31,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x6b,0x31,0x00, + 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, + 0x6b,0x31,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x6b,0x31,0x00, + 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0x6b,0x31,0x00, 0x94,0x52,0x00, 0xad,0x5a,0x00, + 0x6b,0x31,0x00, 0x52,0x29,0x00, 0x52,0x29,0x00, 0x6b,0x31,0x00, + 0x94,0x52,0x00, 0xad,0x5a,0x00, 0x6b,0x31,0x00, 0x52,0x29,0x00, + 0x52,0x29,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, + 0xb5,0xb5,0xb5, 0xc6,0xc6,0xc6, 0x6b,0x31,0x00, 0xc6,0xc6,0xc6, + 0xb5,0xb5,0xb5, 0x52,0x29,0x00, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, + 0x6b,0x31,0x00, 0x6b,0x31,0x00, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, + 0xb5,0xb5,0xb5, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, + 0xb5,0xb5,0xb5, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0xc6,0xc6,0xc6, + 0xb5,0xb5,0xb5, 0xb5,0xb5,0xb5, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, + 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0xb5,0xb5,0xb5, + 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x84,0x00,0x00, + 0xc6,0x00,0x00, 0xc6,0x00,0x00, 0x84,0x00,0x00, 0xc6,0x00,0x00, + 0x84,0x00,0x00, 0x84,0x00,0x00, 0xc6,0x00,0x00, 0xc6,0x00,0x00, + 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, + 0x84,0x00,0x00, 0x84,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x42,0x00,0x00, + 0x42,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, + 0x84,0x00,0x00, 0x42,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, + 0x42,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, + 0x42,0x00,0x00, 0x84,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x42,0x00,0x00, + 0x84,0x00,0x00, 0x42,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, + 0x84,0x00,0x00, 0x42,0x00,0x00, 0x52,0x29,0x00, 0x42,0x00,0x00, + 0x6b,0x31,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, + 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x42,0x00,0x00, + 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, + 0x42,0x00,0x00, 0x42,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, + 0x84,0x00,0x00, 0x00,0x00,0x00, 0xb5,0xb5,0xb5, 0x42,0x42,0x42, + 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0xb5,0xb5,0xb5, 0x00,0x00,0x00, + 0x00,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x42,0x00,0x00, + 0x84,0x00,0x00, 0x42,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, + 0x84,0x00,0x00, 0x42,0x00,0x00, 0xc6,0x00,0x00, 0x42,0x00,0x00, + 0xc6,0x00,0x00, 0x42,0x00,0x00, 0x00,0x00,0x00, 0xc6,0xc6,0xc6, + 0x42,0x42,0x42, 0x42,0x42,0x42, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, + 0xb5,0xb5,0xb5, 0x00,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x42,0x00,0x00, + 0x42,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x42,0x00,0x00, + 0x84,0x00,0x00, 0x42,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, + 0x00,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x00,0x00,0x00, + 0x00,0x00,0x00, 0xc6,0xc6,0xc6, 0x42,0x42,0x42, 0xff,0xff,0xff, + 0xb5,0xb5,0xb5, 0x00,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, 0x84,0x00,0x00, + 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, + 0x84,0x00,0x00, 0xff,0xff,0xff, 0x00,0x00,0x00, 0xff,0xff,0xff, + 0xb5,0xb5,0xb5, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x84,0x00,0x00, + 0x84,0x00,0x00, 0x00,0x00,0x00, 0x42,0x42,0x42, 0xc6,0xc6,0xc6, + 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0x00,0x00,0x00, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x84,0x00,0x00, + 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, + 0x84,0x00,0x00, 0x84,0x00,0x00, 0x00,0x00,0x00, 0xff,0xff,0xff, + 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0x00,0x00,0x00, + 0x42,0x42,0x42, 0x42,0x42,0x42, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0x00,0x00,0x00, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, 0x84,0x00,0x00, + 0x84,0x00,0x00, 0x84,0x00,0x00, 0x00,0x00,0x00, 0x42,0x42,0x42, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xff,0xff,0xff, + 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, + 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0x00,0x00,0x00, + 0x00,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0x42,0x42,0x42, 0xff,0xff,0xff, + 0x42,0x42,0x42, 0x42,0x42,0x42, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xff,0xff,0xff, + 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, + 0xb5,0xb5,0xb5, 0x00,0x00,0x00, 0x00,0x00,0x00, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0x00,0x00,0x00, 0xc6,0xc6,0xc6, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0x42,0x42,0x42, 0x42,0x42,0x42, + 0x42,0x42,0x42, 0x42,0x42,0x42, 0xb5,0xb5,0xb5, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, + 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0xff,0xff,0xff, 0x00,0x00,0x00, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0x00,0x00,0x00, + 0x00,0x00,0x00, 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, + 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0x42,0x42,0x42, 0x42,0x42,0x42, + 0x42,0x42,0x42, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, + 0xb5,0xb5,0xb5, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, + 0xb5,0xb5,0xb5, 0x42,0x42,0x42, 0x42,0x42,0x42, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xb5,0xb5,0xb5, 0x42,0x42,0x42, + 0x42,0x42,0x42, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0xc6,0xc6,0xc6, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0x00,0x00,0x00, 0x00,0x00,0x00, + 0x00,0x00,0x00, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xc6,0xc6,0xc6, + 0xb5,0xb5,0xb5, 0x42,0x42,0x42, 0x42,0x42,0x42, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xc6,0xc6,0xc6, 0x42,0x42,0x42, 0x42,0x42,0x42, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0x00,0x00,0x00, 0x00,0x00,0x00, + 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, + +}; -- cgit v1.2.3