add Setup.Configuration package contents and reference them directly

rainers · Sep 29, 2018 · 58dab3c · 58dab3c
1 parent 4a7bbd3
commit 58dab3c
Show file tree

Hide file tree

Showing 5 changed files with 1,029 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,3 @@
 *.user
 /src/.vs
 /src/*.opensdf
-/src/packages
diff --git a/src/mspdb.cpp b/src/mspdb.cpp
@@ -6,10 +6,9 @@
 
 #include "mspdb.h"
 
-#include <atlstr.h>
 #include <comdef.h>
 #include <windows.h>
-#include <Setup.Configuration.h>
+#include "packages/Microsoft.VisualStudio.Setup.Configuration.Native.1.16.30/lib/native/include/Setup.Configuration.h"
 
 _COM_SMARTPTR_TYPEDEF(ISetupConfiguration, __uuidof(ISetupConfiguration));
 _COM_SMARTPTR_TYPEDEF(ISetupInstance, __uuidof(ISetupInstance));
@@ -108,9 +107,12 @@ bool tryLoadMsPdbCom(const char* mspdb, const char* path = 0)
 		if (FAILED(instance->GetInstallationPath(&installDir)))
 			continue;
 
-		CStringA modpath = installDir;
-		modpath += "\\Common7\\IDE\\";
-		modpath += mspdb;
+		char modpath[260];
+		WideCharToMultiByte(CP_ACP, 0, installDir, -1, modpath, 260, NULL, NULL);
+		SysFreeString(installDir);
+
+		strncat(modpath, "\\Common7\\IDE\\", 260); // wrong path for x64 build of cv2pdb
+		strncat(modpath, mspdb, 260);
 		tryLoadLibrary(modpath);
 	}
 
@@ -132,7 +134,7 @@ bool tryLoadMsPdbVS2017(const char* mspdb, const char* path = 0)
 	if(!rc)
 		return false;
 
-	strncat(installDir, "Common7\\IDE\\", 260);
+	strncat(installDir, "Common7\\IDE\\", 260);  // wrong path for x64 build of cv2pdb
 	strncat(installDir, mspdb, 260);
 
 	tryLoadLibrary(installDir);

diff --git a/...ion.Native.1.16.30/build/native/Microsoft.VisualStudio.Setup.Configuration.Native.targets b/...ion.Native.1.16.30/build/native/Microsoft.VisualStudio.Setup.Configuration.Native.targets
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<Project ToolVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)..\..\lib\native\include\</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32' And Exists('$(MSBuildThisFileDirectory)..\..\lib\native\$(PlatformToolset)\x86')">
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies);Microsoft.VisualStudio.Setup.Configuration.Native.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(MSBuildThisFileDirectory)..\..\lib\native\$(PlatformToolset)\x86</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='x64' And Exists('$(MSBuildThisFileDirectory)..\..\lib\native\$(PlatformToolset)\x64')">
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies);Microsoft.VisualStudio.Setup.Configuration.Native.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(MSBuildThisFileDirectory)..\..\lib\native\$(PlatformToolset)\x64</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>