From d6fc5e21260daae95e676d88f833ed55a71bef1b Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Fri, 29 Mar 2019 00:44:13 -0700 Subject: [PATCH] Use locally-named properties in Veldrid.SDL2.targets. --- .../build/net40/Veldrid.SDL2.targets | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Veldrid.SDL2/build/net40/Veldrid.SDL2.targets b/src/Veldrid.SDL2/build/net40/Veldrid.SDL2.targets index a7b01dbdd..43b4e24b8 100644 --- a/src/Veldrid.SDL2/build/net40/Veldrid.SDL2.targets +++ b/src/Veldrid.SDL2/build/net40/Veldrid.SDL2.targets @@ -1,18 +1,18 @@ - <_IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true - <_IsMacOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true + <_Veldrid_SDL2_IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true + <_Veldrid_SDL2_IsMacOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true - <_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsMacOS)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">osx-x64 - <_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'true' Or '$(PlatformTarget)' == 'x86')">win-x86 - <_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">win-x64 + <_Veldrid_SDL2_NativeRuntime Condition=" '$(_Veldrid_SDL2_NativeRuntime)' == '' And '$(_Veldrid_SDL2_IsMacOS)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">osx-x64 + <_Veldrid_SDL2_NativeRuntime Condition=" '$(_Veldrid_SDL2_NativeRuntime)' == '' And '$(_Veldrid_SDL2_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'true' Or '$(PlatformTarget)' == 'x86')">win-x86 + <_Veldrid_SDL2_NativeRuntime Condition=" '$(_Veldrid_SDL2_NativeRuntime)' == '' And '$(_Veldrid_SDL2_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">win-x64 - <_NativeLibName Condition="'$(_NativeRuntime)' == 'win-x86' Or '$(_NativeRuntime)' == 'win-x64'">SDL2.dll - <_NativeLibName Condition="'$(_NativeRuntime)' == 'osx-x64'">libsdl2.dylib + <_Veldrid_SDL2_NativeLibName Condition="'$(_Veldrid_SDL2_NativeRuntime)' == 'win-x86' Or '$(_Veldrid_SDL2_NativeRuntime)' == 'win-x64'">SDL2.dll + <_Veldrid_SDL2_NativeLibName Condition="'$(_Veldrid_SDL2_NativeRuntime)' == 'osx-x64'">libsdl2.dylib - + %(Filename)%(Extension) Always False