aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authortwinaphex2019-01-04 18:28:03 +0100
committertwinaphex2019-01-04 18:28:03 +0100
commitc9b3980caaf1ab3a20c5e002e48c365347f522db (patch)
treedd8544013b5c37873ca0dbfce83009c472ad3f68 /Makefile
parent0921ac9055acf61e940152793013903d54036fea (diff)
downloadsnes9x2005-c9b3980caaf1ab3a20c5e002e48c365347f522db.tar.gz
snes9x2005-c9b3980caaf1ab3a20c5e002e48c365347f522db.tar.bz2
snes9x2005-c9b3980caaf1ab3a20c5e002e48c365347f522db.zip
VC2017 buildfix
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 10 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 872bed0..384e2a9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,15 @@ LOAD_FROM_MEMORY_TEST = 1
USE_BLARGG_APU = 0
LAGFIX = 1
+SPACE :=
+SPACE := $(SPACE) $(SPACE)
+BACKSLASH :=
+BACKSLASH := \$(BACKSLASH)
+filter_out1 = $(filter-out $(firstword $1),$1)
+filter_out2 = $(call filter_out1,$(call filter_out1,$1))
+unixpath = $(subst \,/,$1)
+unixcygpath = /$(subst :,,$(call unixpath,$1))
+
ifeq ($(platform),)
ifeq (,$(findstring classic_,$(platform)))
platform = unix
@@ -435,7 +444,7 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/include")
LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/lib/$(TargetArchMoniker)")
ifneq (,$(findstring uwp,$(PlatformSuffix)))
- LIB := $(shell IFS=$$'\n'; cygpath -w "$(LIB)/store")
+ LIB := $(LIB);$(shell IFS=$$'\n'; cygpath -w "$(LIB)/store")
endif
export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir)