X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=b3a18b5e8376783f38f370f7d6a6201ae2cdd656;hb=79d9ea719f6a44c452f394600c6076063d4c73de;hp=e42d5370f7c73fb0b4170e001fe3a45b4d48cd72;hpb=fb81506227581bcc04cd4835b8e3f41a109d1f97;p=rocksndiamonds.git diff --git a/src/Makefile b/src/Makefile index e42d5370..b3a18b5e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,6 +19,15 @@ ifndef PLATFORM # unknown platform -- default to Unix PLATFORM = unix endif +PLATFORM_BASE = $(PLATFORM) + +ifeq ($(PLATFORM),cross-win32) +PLATFORM_BASE = cross-win +endif +ifeq ($(PLATFORM),cross-win64) +PLATFORM_BASE = cross-win +endif + AR = ar RANLIB = ranlib ETAGS = etags @@ -48,7 +57,7 @@ ifeq ($(PLATFORM),unix) # compiling on Unix/Linux (generic) PROFILING_FLAGS = -pg endif -ifeq ($(PLATFORM),cross-win32) # cross-compiling to Windows +ifeq ($(PLATFORM_BASE),cross-win) # cross-compiling to Windows PROGNAME = ../$(PROGBASE).exe EXTRA_LDFLAGS = -lshfolder -lwsock32 endif @@ -200,7 +209,7 @@ AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h ICONBASE = windows_icon ICON_BASEPATH = ../Special/Icons/windows_icons -ifeq ($(PLATFORM),cross-win32) +ifeq ($(PLATFORM_BASE),cross-win) ICON_PATH = $(ICON_BASEPATH)/$(EDITION) ICON = $(ICONBASE).o endif