summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2005-09-20 20:13:15 +0000
committerSimon Howard2005-09-20 20:13:15 +0000
commitf8d14bad71184718a1ed1f646a07c8a5b9204cd6 (patch)
tree29734de4fef2da52eefb0ba84699e6d1c4e0e0a2
parent1f2a875ab5dbe522366f79c11efd36a3854c66a5 (diff)
downloadchocolate-doom-f8d14bad71184718a1ed1f646a07c8a5b9204cd6.tar.gz
chocolate-doom-f8d14bad71184718a1ed1f646a07c8a5b9204cd6.tar.bz2
chocolate-doom-f8d14bad71184718a1ed1f646a07c8a5b9204cd6.zip
Include icon in exe, rather than the default icon. Thanks to Joe Kennedy
for drawing this icon. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 115
-rw-r--r--Makefile.am8
-rw-r--r--data/chocolate-doom.icobin0 -> 2238 bytes
-rw-r--r--data/chocolate-doom.pngbin0 -> 1308 bytes
-rw-r--r--src/Makefile.am6
4 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index aa44549c..ddb532d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,14 @@ AUX_DIST_GEN = \
$(ac_aux_dir)/install-sh \
$(ac_aux_dir)/missing
+EXTRA_DIST= \
+ $(AUX_DIST_GEN) \
+ config.h \
+ TODO \
+ BUGS \
+ data/chocolate-doom.png \
+ data/chocolate-doom.ico
-EXTRA_DIST=$(AUX_DIST_GEN) config.h TODO BUGS
MAINTAINERCLEANFILES = $(AUX_DIST_GEN)
docdir=$(prefix)/share/doc/@PACKAGE@
diff --git a/data/chocolate-doom.ico b/data/chocolate-doom.ico
new file mode 100644
index 00000000..49ed621e
--- /dev/null
+++ b/data/chocolate-doom.ico
Binary files differ
diff --git a/data/chocolate-doom.png b/data/chocolate-doom.png
new file mode 100644
index 00000000..a14e63dd
--- /dev/null
+++ b/data/chocolate-doom.png
Binary files differ
diff --git a/src/Makefile.am b/src/Makefile.am
index b6252898..0ae274d5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,8 +25,12 @@ doomtype.h info.h m_swap.c p_sight.c r_segs.h w_wad.h \
d_player.h i_sound.c m_swap.h p_spec.c r_sky.c z_zone.c \
dstrings.c i_sound.h p_ceilng.c p_spec.h r_sky.h z_zone.h \
dstrings.h i_system.c p_doors.c p_switch.c r_state.h mmus2mid.c \
-d_textur.h i_system.h p_enemy.c p_telept.c r_things.c mmus2mid.h
+d_textur.h i_system.h p_enemy.c p_telept.c r_things.c mmus2mid.h \
+chocolate-doom-res.rc
bin_PROGRAMS = chocolate-doom
+.rc.o:
+ windres $^ -o $@
+