X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FMakefile;fp=src%2FMakefile;h=b7289d01ddc7a8492dd83ef6729d2956120c35df;hp=899bab0fb18506cb8d15e185bc42e5f48dd48ff6;hb=4867b769fb4ce52d71200bb147bfa511cb84cc9c;hpb=f02d783598e181be9e1d7d8643fac7ec27d2a84c

diff --git a/src/Makefile b/src/Makefile
index 899bab0f..b7289d01 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -44,8 +44,6 @@ DEBUGGER = gdb -batch -ex "run" -ex "bt"
 PROGBASE = rocksndiamonds
 PROGNAME = ../$(PROGBASE)
 
-EDITION ?= default
-
 
 # -----------------------------------------------------------------------------
 # configuring platform
@@ -250,10 +248,10 @@ RNDLIBS = $(LIBGAME) $(GAME_EM) $(GAME_SP) $(GAME_MM)
 AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
 
 ICONBASE = windows_icon
-ICON_BASEPATH = ../Special/Icons/windows_icons
+ICON_BASEPATH = ../build-projects/windows/icons
 
 ifeq ($(PLATFORM_BASE),cross-win)
-ICON_PATH = $(ICON_BASEPATH)/$(EDITION)
+ICON_PATH = $(ICON_BASEPATH)
 ICON = $(ICONBASE).o
 endif
 
@@ -333,7 +331,6 @@ $(COMMIT_HASH_FILE): $(SRCS) $(RNDLIBS)
 	@$(MAKE) conf-hash
 
 $(ICON):
-#	$(CONVERT) $(ICON32X32) $(CONVERT_ICON_ARGS) $(ICONBASE).ico
 	$(CONVERT) $(ICON_PATH)/*.png $(CONVERT_ICON_ARGS) $(ICONBASE).ico
 	echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)