From c9b3980caaf1ab3a20c5e002e48c365347f522db Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 4 Jan 2019 18:28:03 +0100 Subject: VC2017 buildfix --- Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3