Add icon for setup tool.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 777

9 files changed, 337 insertions, 6 deletions

diff --git a/Makefile.am b/Makefile.am
index 961a776e..f02f55d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,16 +18,22 @@ CODEBLOCKS_FILES=                              \
         codeblocks/chocolate-doom-res.rc       \
         codeblocks/textscreen.cbp
 
+DATA_FILES=                             \
+        data/chocolate-doom.ico         \
+        data/chocolate-doom.png         \
+        data/chocolate-setup.ico        \
+        data/chocolate-setup.png        \
+        data/convert-icon
+
 EXTRA_DIST=                             \
         $(AUX_DIST_GEN)                 \
         $(MSVC_FILES)                   \
         $(CODEBLOCKS_FILES)             \
+        $(DATA_FILES)                   \
         config.h                        \
         HACKING                         \
         TODO                            \
-        BUGS                            \
-        data/chocolate-doom.png         \
-        data/chocolate-doom.ico
+        BUGS
 
 MAINTAINERCLEANFILES =  $(AUX_DIST_GEN)
 
diff --git a/data/chocolate-setup.ico b/data/chocolate-setup.ico
new file mode 100644
index 00000000..44985ba6
--- /dev/null
+++ b/data/chocolate-setup.ico
diff --git a/data/chocolate-setup.png b/data/chocolate-setup.png
new file mode 100644
index 00000000..2de1bbb0
--- /dev/null
+++ b/data/chocolate-setup.png
diff --git a/src/convert-icon b/data/convert-icon
index 16412378..16412378 100755
--- a/src/convert-icon
+++ b/data/convert-icon
diff --git a/setup/Makefile.am b/setup/Makefile.am
index b0f2a276..f4c37cce 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -6,7 +6,7 @@ AM_CFLAGS = @SDL_CFLAGS@ -I../textscreen -I../src -DINSTALL_DIR="\"$(gamesdir)\"
 games_PROGRAMS = chocolate-setup
 
 chocolate_setup_LDADD = @LDFLAGS@ @SDL_LIBS@ ../textscreen/libtextscreen.a
-chocolate_setup_SOURCES =                       \
+SOURCE_FILES =                                  \
     compatibility.c   compatibility.h           \
     configfile.c      configfile.h              \
     display.c         display.h                 \
@@ -20,3 +20,20 @@ chocolate_setup_SOURCES =                       \
     txt_keyinput.c    txt_keyinput.h            \
     txt_mouseinput.c  txt_mouseinput.h
 
+EXTRA_DIST=                                     \
+    chocolate_setup_icon.c
+
+if HAVE_WINDRES
+chocolate_setup_SOURCES=$(SOURCE_FILES) chocolate-setup-res.rc
+else
+chocolate_setup_SOURCES=$(SOURCE_FILES)
+endif
+
+.rc.o:
+	$(WINDRES) $^ -o $@
+%.o : %.rc
+	$(WINDRES) $^ -o $@
+
+chocolate_setup_icon.c : ../data/chocolate-setup.png
+	../data/convert-icon $^ $@
+
diff --git a/setup/chocolate-setup-res.rc.in b/setup/chocolate-setup-res.rc.in
new file mode 100644
index 00000000..cb49a1b2
--- /dev/null
+++ b/setup/chocolate-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/chocolate_setup_icon.c b/setup/chocolate_setup_icon.c
new file mode 100644
index 00000000..c81f9f9e
--- /dev/null
+++ b/setup/chocolate_setup_icon.c
@@ -0,0 +1,262 @@
+static int chocolate_setup_w = 32;
+static int chocolate_setup_h = 32;
+
+static unsigned char chocolate_setup_data[] = {
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,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,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,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,  0x6b,0x31,0x00,  
+    0x6b,0x31,0x00,  0x6b,0x31,0x00,  0x6b,0x31,0x00,  0x52,0x29,0x00,  
+    0x52,0x29,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,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,  0x6b,0x31,0x00,  
+    0x94,0x52,0x00,  0xad,0x5a,0x00,  0x6b,0x31,0x00,  0x52,0x29,0x00,  
+    0x52,0x29,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,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,  0x6b,0x31,0x00,  
+    0x6b,0x31,0x00,  0x6b,0x31,0x00,  0x6b,0x31,0x00,  0x52,0x29,0x00,  
+    0x52,0x29,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,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,  
+    0x52,0x29,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,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,  0x6b,0x31,0x00,  
+    0x6b,0x31,0x00,  0x6b,0x31,0x00,  0x6b,0x31,0x00,  0x52,0x29,0x00,  
+    0x52,0x29,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,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,  0x6b,0x31,0x00,  
+    0x94,0x52,0x00,  0xad,0x5a,0x00,  0x6b,0x31,0x00,  0x52,0x29,0x00,  
+    0x52,0x29,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  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,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  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,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  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,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  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,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  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,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  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,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  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,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  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,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  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,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  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,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    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,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  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,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  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,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  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,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  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,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0xff,0xff,0xff,  0xc6,0xc6,0xc6,  0xb5,0xb5,0xb5,  0x42,0x42,0x42,  
+    0x42,0x42,0x42,  0xff,0xff,0xff,  0xc6,0xc6,0xc6,  0xc6,0xc6,0xc6,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0xff,0xff,0xff,  0xc6,0xc6,0xc6,  
+    0xb5,0xb5,0xb5,  0x42,0x42,0x42,  0x42,0x42,0x42,  0xff,0xff,0xff,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0xff,0xff,0xff,  0xc6,0xc6,0xc6,  0x42,0x42,0x42,  0x42,0x42,0x42,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  0x00,0x00,0x00,  
+    
+};
diff --git a/setup/mainmenu.c b/setup/mainmenu.c
index 08b7d6d8..cb645463 100644
--- a/setup/mainmenu.c
+++ b/setup/mainmenu.c
@@ -28,6 +28,8 @@
 #include "configfile.h"
 #include "m_argv.h"
 
+#include "chocolate_setup_icon.c"
+
 #include "compatibility.h"
 #include "display.h"
 #include "keyboard.h"
@@ -140,6 +142,28 @@ static void InitConfig(void)
     M_LoadDefaults();
 }
 
+//
+// Application icon
+//
+
+static void SetIcon(void)
+{
+    SDL_Surface *surface;
+
+    surface = SDL_CreateRGBSurfaceFrom(chocolate_setup_data,
+                                       chocolate_setup_w,
+                                       chocolate_setup_h,
+                                       24,
+                                       chocolate_setup_w * 3,
+                                       0xff << 0,
+                                       0xff << 8,
+                                       0xff << 16,
+                                       0);
+
+    SDL_WM_SetIcon(surface, NULL);
+    SDL_FreeSurface(surface);
+}
+
 // 
 // Initialise and run the textscreen GUI.
 //
@@ -153,6 +177,7 @@ static void RunGUI(void)
     }
 
     TXT_SetDesktopTitle(PACKAGE_NAME " Setup ver " PACKAGE_VERSION);
+    SetIcon();
     
     MainMenu();
 
diff --git a/src/Makefile.am b/src/Makefile.am
index c27f2c35..6ffac860 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -140,7 +140,6 @@ endif
 chocolate_doom_LDADD = ../textscreen/libtextscreen.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@ 
 
 EXTRA_DIST =                               \
-        convert-icon                       \
         chocolate_doom_icon.c              \
         chocolate-doom-screensaver.desktop
 
@@ -150,5 +149,5 @@ EXTRA_DIST =                               \
 	$(WINDRES) $^ -o $@
 
 chocolate_doom_icon.c : ../data/chocolate-doom.png
-	./convert-icon $^ $@
+	../data/convert-icon $^ $@