added support for compiling non-default Windows icons into the executable

If the environment variable "EDITION" is defined, it is used to search at
a non-default location for icons to be compiled into the R'n'D executable
when building the game for the Windows platform.

diff --git a/src/Makefile b/src/Makefile
index f33c2e86e13cef0567994089ea4f3b8179034fb7..da2806bb2a3496aa1d4b7c8dcfdcfa55882b1f01 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -32,6 +32,8 @@ CONVERT_ICON_ARGS = -transparent black -background transparent
 PROGBASE = rocksndiamonds
 PROGNAME = ../$(PROGBASE)
 
 PROGBASE = rocksndiamonds
 PROGNAME = ../$(PROGBASE)
 

+EDITION ?= default
+

 
 # -----------------------------------------------------------------------------
 # configuring platform
 
 # -----------------------------------------------------------------------------
 # configuring platform


@@ -205,7 +207,7 @@ ICONBASE = windows_icon
 ICON_BASEPATH = ../Special/Icons/windows_icons
 
 ifeq ($(PLATFORM),cross-win32)
 ICON_BASEPATH = ../Special/Icons/windows_icons
 
 ifeq ($(PLATFORM),cross-win32)

-ICON_PATH = $(ICON_BASEPATH)/default
+ICON_PATH = $(ICON_BASEPATH)/$(EDITION)

 ICON = $(ICONBASE).o
 endif
 
 ICON = $(ICONBASE).o
 endif