From de83140394db0bf86bff78b8fb572c25025216b3 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Thu, 23 May 2019 12:12:38 +0200
Subject: [PATCH] update paths to dd libs

---
 app/Setup/Product.wxs   | 10 +++++-----
 app/Setup/Setup.wixproj |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Setup/Product.wxs b/app/Setup/Product.wxs
index 66bbe4c..ab5bdc2 100644
--- a/app/Setup/Product.wxs
+++ b/app/Setup/Product.wxs
@@ -110,11 +110,11 @@
       <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
         <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="yes"/>
         <File Id="DDLibStandards" Name="DD_LIB_Standards.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll"/>
-        <File Id="LookupGrid" Name="DigitalData.Controls.LookupGrid.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DigitalData.Controls.LookupGrid.dll"/>
-        <File Id="DDConfig" Name="DigitalData.Modules.Config.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DigitalData.Modules.Config.dll"/>
-        <File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DigitalData.Modules.Logging.dll"/>
-        <File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DigitalData.Modules.Filesystem.dll"/>
-        <File Id="NLog" Name="NLog.dll" Source="P:\Visual Studio Projekte\Bibliotheken\NLog.dll"/>
+        <File Id="LookupGrid" Name="DigitalData.Controls.LookupGrid.dll" Source="DigitalData.Controls.LookupGrid.dll"/>
+        <File Id="DDConfig" Name="DigitalData.Modules.Config.dll" Source="DigitalData.Modules.Config.dll"/>
+        <File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll"/>
+        <File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll" Source="DigitalData.Modules.Filesystem.dll"/>
+        <File Id="NLog" Name="NLog.dll" Source="NLog.dll"/>
       </Component>
 
       <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
diff --git a/app/Setup/Setup.wixproj b/app/Setup/Setup.wixproj
index 844b015..c9a79fc 100644
--- a/app/Setup/Setup.wixproj
+++ b/app/Setup/Setup.wixproj
@@ -10,11 +10,16 @@
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <IncludeSearchPaths>
+    </IncludeSearchPaths>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
+    <LinkerAdditionalOptions>
+      -b "$(SolutionDir)DD_PM_WINDREAM\bin\$(Configuration)"
+    </LinkerAdditionalOptions>
     <Cultures>
     </Cultures>
   </PropertyGroup>