rnd-20070914-1-src

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 83f5cdb63822f33d2ff3fb0ab3cda1836fde9888..8d8df9422341556b7b0d5c2ce7a059ed7a01bba2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -197,7 +197,8 @@ CNFS =      conf_gfx.h      \
        conf_fnt.c      \
        conf_g2s.c      \
        conf_g2m.c      \
-       conf_var.c
+       conf_var.c      \
+       conf_act.c
 
 CNFS_CMD = ../Scripts/create_element_defs.pl
 
@@ -213,7 +214,12 @@ RNDLIBS = $(LIBGAME) $(GAME_EM)
 
 ICONBASE = windows_icon
 ifeq ($(PLATFORM),cross-win32)
-ICON32X32 = ../graphics/$(ICONBASE)_32x32.bmp
+ifdef SPECIAL_ICON
+ICONSUFFIX = 32x32_$(SPECIAL_ICON)
+else
+ICONSUFFIX = 32x32
+endif
+ICON32X32 = ../graphics/$(ICONBASE)_$(ICONSUFFIX).bmp
 ICON = $(ICONBASE).o
 endif