diff options
author | Simon Howard | 2005-10-08 18:23:18 +0000 |
---|---|---|
committer | Simon Howard | 2005-10-08 18:23:18 +0000 |
commit | 3519b53f176697dc8fdc6321e32b0eb598a2e9f4 (patch) | |
tree | b301159e06ba2f7b01c3854bd463e990e7b70cd3 /src/Makefile.am | |
parent | 968c30b02484585d03ed757b317a39b2f6a15556 (diff) | |
download | chocolate-doom-3519b53f176697dc8fdc6321e32b0eb598a2e9f4.tar.gz chocolate-doom-3519b53f176697dc8fdc6321e32b0eb598a2e9f4.tar.bz2 chocolate-doom-3519b53f176697dc8fdc6321e32b0eb598a2e9f4.zip |
WAD merging code
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 168
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 784afc7f..3072c8d6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,7 +30,7 @@ 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 \ deh_defs.h deh_frame.c deh_main.c deh_ptr.c deh_text.c deh_thing.c \ deh_io.c deh_io.h deh_ammo.c deh_cheat.c deh_weapon.c \ -deh_misc.c deh_mapping.c deh_mapping.h +deh_misc.c deh_mapping.c deh_mapping.h w_merge.c w_merge.h if HAVE_WINDRES |