From 95a5543a04cd4f52c5749b19b5183626e3853594 Mon Sep 17 00:00:00 2001
From: lukeIam <mail2skywalker@gmail.com>
Date: Thu, 1 Oct 2015 22:36:51 +0200
Subject: [PATCH] - Changed lib probing paths - Fixed a pdb error

---
 Vocaluxe/Program.cs      |  9 +++++++++
 Vocaluxe/Vocaluxe.csproj |  2 +-
 Vocaluxe/app.config      | 11 ++++++++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Vocaluxe/Program.cs b/Vocaluxe/Program.cs
index 43964170..4da68bf2 100644
--- a/Vocaluxe/Program.cs
+++ b/Vocaluxe/Program.cs
@@ -52,6 +52,15 @@ namespace Vocaluxe
             AppDomain.CurrentDomain.UnhandledException += UnhandledExceptionHandler;
 #endif
             AppDomain.CurrentDomain.AssemblyResolve += _AssemblyResolver;
+            COSFunctions.AddEnvironmentPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\"));
+            #if ARCH_X86
+            COSFunctions.AddEnvironmentPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\x86\\"));
+#endif
+#if ARCH_X64
+            COSFunctions.AddEnvironmentPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\x64\\"));
+#endif
+            
+
             // Close program if there is another instance running
             if (!_EnsureSingleInstance())
                 return;
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index 795172ef..7ed82318 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -517,7 +517,7 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
       <x86FolderFilesToMove Include="$(TargetDir)x86\*.*"/>
     </ItemGroup>
 	<ItemGroup>
-      <OtherFilesToMove Include="$(TargetDir)System.Data.SQLite.xml;$(TargetDir)VocaluxeLib.pdb;"/>
+      <OtherFilesToMove Include="$(TargetDir)System.Data.SQLite.xml;"/>
     </ItemGroup>
     <Move
         SourceFiles="@(RootDLLFilesToMove)"
diff --git a/Vocaluxe/app.config b/Vocaluxe/app.config
index c0dafe77..d1480e79 100644
--- a/Vocaluxe/app.config
+++ b/Vocaluxe/app.config
@@ -1,9 +1,14 @@
 <?xml version="1.0"?>
 <configuration>
   <startup>
-    
-  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
-<!-- Enable for WCF tracing
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="libs\managed\;libs\unmanaged;libs\;.;libs\managed\x64\;libs\unmanaged\x64\;libs\x64\;.\x64\;libs\managed\x86\;libs\unmanaged\x86\;libs\x86\;.\x86\" />
+    </assemblyBinding>
+  </runtime>
+  <!-- Enable for WCF tracing
   <system.serviceModel>
     <diagnostics>
       <messageLogging logEntireMessage="true" logMalformedMessages="true"