From 62a4abac33e8d58b036221e038dd0b05267fffe8 Mon Sep 17 00:00:00 2001 From: Alberto Fustinoni Date: Tue, 22 Aug 2017 15:23:22 +0900 Subject: [PATCH] build --- Makefile.libretro | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.libretro b/Makefile.libretro index 15d3e57..df6d820 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -295,6 +295,16 @@ else ifeq ($(platform), gcw0) # Windows MSVC 2017 all architectures else ifneq (,$(findstring windows_msvc2017,$(platform))) + + PlatformSuffix = $(subst windows_msvc2017_,,$(platform)) + ifneq (,$(findstring desktop,$(PlatformSuffix))) + WinPartition = desktop + else ifneq (,$(findstring uwp,$(PlatformSuffix))) + WinPartition = uwp + endif + + TargetArchMoniker = $(subst $(WinPartition)_,,$(PlatformSuffix)) + CC = cl.exe CXX = cl.exe @@ -333,8 +343,6 @@ else ifneq (,$(findstring windows_msvc2017,$(platform))) VcCompilerToolsVer := $(shell cat "$(VsInstallRoot)/VC/Auxiliary/Build/Microsoft.VCToolsVersion.default.txt" | grep -o '[0-9\.]*') VcCompilerToolsDir := $(VsInstallRoot)/VC/Tools/MSVC/$(VcCompilerToolsVer) - TargetArchMoniker = $(subst windows_msvc2017_,,$(platform)) - WindowsSDKUCRTIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\$(WindowsSDKVersion)\ucrt") WindowsSDKUMIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\$(WindowsSDKVersion)\um") WindowsSDKUCRTLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib\$(WindowsSDKVersion)\ucrt\$(TargetArchMoniker)")