From 2982d61547ff55c555c2d161f921af87faf87b41 Mon Sep 17 00:00:00 2001
From: Virgile Bello <virgile@xenko.com>
Date: Wed, 23 Jan 2019 14:44:47 +0900
Subject: [PATCH] [Build] Native: use vcxproj directly to avoid TRK0005: Failed
 to locate: "link.exe" or "cl.exe" (fixes #337)

---
 sources/native/WindowsProjects/UWP/UWP.sln    | 34 -------------------
 .../WindowsProjects/UWP/{UWP => }/UWP.vcxproj |  0
 .../UWP/{UWP => }/UWP.vcxproj.filters         |  0
 .../WindowsProjects/UWP/{UWP => }/dllmain.cpp |  0
 .../WindowsDesktop/WindowsDesktop.sln         | 28 ---------------
 .../WindowsDesktop.vcxproj                    |  0
 .../WindowsDesktop.vcxproj.filters            |  0
 .../{WindowsDesktop => }/dllmain.cpp          |  0
 sources/native/Xenko.Native.targets           | 10 +++---
 9 files changed, 5 insertions(+), 67 deletions(-)
 delete mode 100644 sources/native/WindowsProjects/UWP/UWP.sln
 rename sources/native/WindowsProjects/UWP/{UWP => }/UWP.vcxproj (100%)
 rename sources/native/WindowsProjects/UWP/{UWP => }/UWP.vcxproj.filters (100%)
 rename sources/native/WindowsProjects/UWP/{UWP => }/dllmain.cpp (100%)
 delete mode 100644 sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop.sln
 rename sources/native/WindowsProjects/WindowsDesktop/{WindowsDesktop => }/WindowsDesktop.vcxproj (100%)
 rename sources/native/WindowsProjects/WindowsDesktop/{WindowsDesktop => }/WindowsDesktop.vcxproj.filters (100%)
 rename sources/native/WindowsProjects/WindowsDesktop/{WindowsDesktop => }/dllmain.cpp (100%)

diff --git a/sources/native/WindowsProjects/UWP/UWP.sln b/sources/native/WindowsProjects/UWP/UWP.sln
deleted file mode 100644
index 8cbba2bcb3..0000000000
--- a/sources/native/WindowsProjects/UWP/UWP.sln
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UWP", "UWP\UWP.vcxproj", "{8F5685D5-4AFF-4D77-A86B-8FEC5C5456A2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8F5685D5-4AFF-4D77-A86B-8FEC5C5456A2}.Debug|ARM.ActiveCfg = Debug|ARM
-		{8F5685D5-4AFF-4D77-A86B-8FEC5C5456A2}.Debug|ARM.Build.0 = Debug|ARM
-		{8F5685D5-4AFF-4D77-A86B-8FEC5C5456A2}.Debug|x64.ActiveCfg = Debug|x64
-		{8F5685D5-4AFF-4D77-A86B-8FEC5C5456A2}.Debug|x64.Build.0 = Debug|x64
-		{8F5685D5-4AFF-4D77-A86B-8FEC5C5456A2}.Debug|x86.ActiveCfg = Debug|Win32
-		{8F5685D5-4AFF-4D77-A86B-8FEC5C5456A2}.Debug|x86.Build.0 = Debug|Win32
-		{8F5685D5-4AFF-4D77-A86B-8FEC5C5456A2}.Release|ARM.ActiveCfg = Release|ARM
-		{8F5685D5-4AFF-4D77-A86B-8FEC5C5456A2}.Release|ARM.Build.0 = Release|ARM
-		{8F5685D5-4AFF-4D77-A86B-8FEC5C5456A2}.Release|x64.ActiveCfg = Release|x64
-		{8F5685D5-4AFF-4D77-A86B-8FEC5C5456A2}.Release|x64.Build.0 = Release|x64
-		{8F5685D5-4AFF-4D77-A86B-8FEC5C5456A2}.Release|x86.ActiveCfg = Release|Win32
-		{8F5685D5-4AFF-4D77-A86B-8FEC5C5456A2}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/sources/native/WindowsProjects/UWP/UWP/UWP.vcxproj b/sources/native/WindowsProjects/UWP/UWP.vcxproj
similarity index 100%
rename from sources/native/WindowsProjects/UWP/UWP/UWP.vcxproj
rename to sources/native/WindowsProjects/UWP/UWP.vcxproj
diff --git a/sources/native/WindowsProjects/UWP/UWP/UWP.vcxproj.filters b/sources/native/WindowsProjects/UWP/UWP.vcxproj.filters
similarity index 100%
rename from sources/native/WindowsProjects/UWP/UWP/UWP.vcxproj.filters
rename to sources/native/WindowsProjects/UWP/UWP.vcxproj.filters
diff --git a/sources/native/WindowsProjects/UWP/UWP/dllmain.cpp b/sources/native/WindowsProjects/UWP/dllmain.cpp
similarity index 100%
rename from sources/native/WindowsProjects/UWP/UWP/dllmain.cpp
rename to sources/native/WindowsProjects/UWP/dllmain.cpp
diff --git a/sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop.sln b/sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop.sln
deleted file mode 100644
index 2940b974bd..0000000000
--- a/sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsDesktop", "WindowsDesktop\WindowsDesktop.vcxproj", "{75C5F896-0E36-4348-9E80-5E9EFE494D94}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{75C5F896-0E36-4348-9E80-5E9EFE494D94}.Debug|x64.ActiveCfg = Debug|x64
-		{75C5F896-0E36-4348-9E80-5E9EFE494D94}.Debug|x64.Build.0 = Debug|x64
-		{75C5F896-0E36-4348-9E80-5E9EFE494D94}.Debug|x86.ActiveCfg = Debug|Win32
-		{75C5F896-0E36-4348-9E80-5E9EFE494D94}.Debug|x86.Build.0 = Debug|Win32
-		{75C5F896-0E36-4348-9E80-5E9EFE494D94}.Release|x64.ActiveCfg = Release|x64
-		{75C5F896-0E36-4348-9E80-5E9EFE494D94}.Release|x64.Build.0 = Release|x64
-		{75C5F896-0E36-4348-9E80-5E9EFE494D94}.Release|x86.ActiveCfg = Release|Win32
-		{75C5F896-0E36-4348-9E80-5E9EFE494D94}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop/WindowsDesktop.vcxproj b/sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop.vcxproj
similarity index 100%
rename from sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop/WindowsDesktop.vcxproj
rename to sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop.vcxproj
diff --git a/sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop/WindowsDesktop.vcxproj.filters b/sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop.vcxproj.filters
similarity index 100%
rename from sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop/WindowsDesktop.vcxproj.filters
rename to sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop.vcxproj.filters
diff --git a/sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop/dllmain.cpp b/sources/native/WindowsProjects/WindowsDesktop/dllmain.cpp
similarity index 100%
rename from sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop/dllmain.cpp
rename to sources/native/WindowsProjects/WindowsDesktop/dllmain.cpp
diff --git a/sources/native/Xenko.Native.targets b/sources/native/Xenko.Native.targets
index 37a85baf54..394f064283 100644
--- a/sources/native/Xenko.Native.targets
+++ b/sources/native/Xenko.Native.targets
@@ -126,12 +126,12 @@
     <MakeDir Directories="$(OutputObjectPath)\x86"/>
     <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; -gcodeview -fno-ms-extensions -nobuiltininc -nostdinc++ $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x86\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -fms-extensions -DWINDOWS_DESKTOP -target i686-pc-windows-msvc" />
     <Exec Condition="'%(XenkoNativeCFile.Extension)' == '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; -gcodeview -fno-ms-extensions -nobuiltininc -nostdinc++ $(XenkoNativeClangCPP) $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x86\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot;  -fms-extensions -DWINDOWS_DESKTOP -target i686-pc-windows-msvc" />
-    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\WindowsDesktop\WindowsDesktop.sln" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\x86;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x86;Configuration=$(Configuration);Platform=x86" StopOnFirstFailure="true" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\WindowsDesktop\WindowsDesktop.vcxproj" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\x86;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x86;Configuration=$(Configuration);Platform=x86" StopOnFirstFailure="true" />
 
     <MakeDir Directories="$(OutputObjectPath)\x64"/>
     <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; -gcodeview -fno-ms-extensions -nobuiltininc -nostdinc++ $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x64\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -fms-extensions -DWINDOWS_DESKTOP -target x86_64-pc-windows-msvc" />
     <Exec Condition="'%(XenkoNativeCFile.Extension)' == '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; -gcodeview -fno-ms-extensions -nobuiltininc -nostdinc++ $(XenkoNativeClangCPP) $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x64\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot;  -fms-extensions -DWINDOWS_DESKTOP -target x86_64-pc-windows-msvc" />
-    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\WindowsDesktop\WindowsDesktop.sln" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)x64;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x64;Configuration=$(Configuration);Platform=x64" StopOnFirstFailure="true" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\WindowsDesktop\WindowsDesktop.vcxproj" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)x64;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x64;Configuration=$(Configuration);Platform=x64" StopOnFirstFailure="true" />
 
     <SignFile Condition="'$(XenkoSignTool)' == 'true'" CertificateThumbprint="6969a724bf72c0b69e31c44bdd22dc11e5272bba" SigningTarget="%(XenkoNativeOutput.Identity)" TimestampUrl="http://timestamp.globalsign.com/scripts/timstamp.dll" />
 	
@@ -142,15 +142,15 @@
   <Target Name="CompileNativeClang_UWP" Inputs="@(XenkoNativeCFile);@(XenkoNativeHFile)" Outputs="@(XenkoNativeOutput)"  Condition="'$(XenkoPlatform)' == 'UWP' And $(DesignTimeBuild) != true And $(BuildingProject) != false" BeforeTargets="CoreCompile" DependsOnTargets="_XenkoRegisterNativeOutputs">
     <MakeDir Directories="$(OutputObjectPath)\x86"/>
     <Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\clang-cl.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x86\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -WX -EHsc -GS- -MD -DUWP -m32" />
-    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\UWP\UWP.sln" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\x86;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x86;Configuration=$(Configuration);Platform=x86" StopOnFirstFailure="true" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\UWP\UWP.vcxproj" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\x86;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x86;Configuration=$(Configuration);Platform=x86" StopOnFirstFailure="true" />
 
     <MakeDir Directories="$(OutputObjectPath)\x64"/>
     <Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\clang-cl.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x64\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -WX -EHsc -GS- -MD -DUWP -m64" />
-    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\UWP\UWP.sln" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\x64;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x64;Configuration=$(Configuration);Platform=x64" StopOnFirstFailure="true" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\UWP\UWP.vcxproj" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\x64;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x64;Configuration=$(Configuration);Platform=x64" StopOnFirstFailure="true" />
 
     <MakeDir Directories="$(OutputObjectPath)\ARM"/>
     <Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\clang-cl.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\ARM\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -WX -EHsc -GS- -MD -DUWP -m32 --target=thumbv7-windows-msvc" />
-    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\UWP\UWP.sln" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\ARM;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\ARM;Configuration=$(Configuration);Platform=ARM" StopOnFirstFailure="true" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\UWP\UWP.vcxproj" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\ARM;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\ARM;Configuration=$(Configuration);Platform=ARM" StopOnFirstFailure="true" />
 
     <!-- Workaround: forcing C# rebuild so that timestamp are up to date (ideally we should have separate input/output groups for C# and Native) -->
     <Delete Files="@(IntermediateAssembly)"/>