From: Holger Schemel Date: Mon, 2 Apr 2018 10:19:00 +0000 (+0200) Subject: added support for compiling non-default Windows icons into the executable X-Git-Tag: 4.1.0.0~5 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=f0c9ece87ae8b4c00974d1d5c11a2147147a1d08;p=rocksndiamonds.git 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 f33c2e86..da2806bb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,6 +32,8 @@ CONVERT_ICON_ARGS = -transparent black -background transparent PROGBASE = rocksndiamonds PROGNAME = ../$(PROGBASE) +EDITION ?= default + # ----------------------------------------------------------------------------- # configuring platform @@ -205,7 +207,7 @@ ICONBASE = windows_icon ICON_BASEPATH = ../Special/Icons/windows_icons ifeq ($(PLATFORM),cross-win32) -ICON_PATH = $(ICON_BASEPATH)/default +ICON_PATH = $(ICON_BASEPATH)/$(EDITION) ICON = $(ICONBASE).o endif