From f8d14bad71184718a1ed1f646a07c8a5b9204cd6 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 20 Sep 2005 20:13:15 +0000 Subject: 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 --- Makefile.am | 8 +++++++- data/chocolate-doom.ico | Bin 0 -> 2238 bytes data/chocolate-doom.png | Bin 0 -> 1308 bytes src/Makefile.am | 6 +++++- 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 data/chocolate-doom.ico create mode 100644 data/chocolate-doom.png 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 Binary files /dev/null and b/data/chocolate-doom.ico differ diff --git a/data/chocolate-doom.png b/data/chocolate-doom.png new file mode 100644 index 00000000..a14e63dd Binary files /dev/null and b/data/chocolate-doom.png 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 $@ + -- cgit v1.2.3