MirOTR: part 4, file/folder structure change

* updated project files to reflect their new locations

git-svn-id: http://svn.miranda-ng.org/main/trunk@12405 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

10 files changed, 104 insertions, 104 deletions

diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 14b365f6ad..7f0453a8b5 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -159,13 +159,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CyrTranslit", "..\plugins\C
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_modern", "..\plugins\Clist_modern\clist_modern_10.vcxproj", "{D9057E63-AAAA-4FE7-800A-20C02F4761F3}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EkHtml", "..\plugins\MirOTR\ekhtml\EkHtml_10.vcxproj", "{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EkHtml", "..\plugins\MirOTR\ekhtml\ekhtml_10.vcxproj", "{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libgcrypt", "..\plugins\MirOTR\libgcrypt-1.4.6\libgcrypt146lib_10.vcxproj", "{40FE7861-E54E-4DA9-BE4D-A5178014E477}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libgcrypt", "..\plugins\MirOTR\Libgcrypt\Libgcrypt_10.vcxproj", "{40FE7861-E54E-4DA9-BE4D-A5178014E477}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libotr", "..\plugins\MirOTR\libotr-3.2.0\libotr320_10.vcxproj", "{1423FC8F-AA52-4562-8275-4BF0838CA378}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libotr", "..\plugins\MirOTR\libotr\libotr_10.vcxproj", "{1423FC8F-AA52-4562-8275-4BF0838CA378}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirOTR", "..\plugins\MirOTR\MirOTR\MirOTR_10.vcxproj", "{53F841E8-284F-4545-9176-B131896E43F8}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirOTR", "..\plugins\MirOTR\MirOTR_10.vcxproj", "{53F841E8-284F-4545-9176-B131896E43F8}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewEventNotify", "..\plugins\NewEventNotify\neweventnotify_10.vcxproj", "{2E0A2793-94C3-82E7-2AB0-FD421816CFBF}"

 EndProject

diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 02490308d5..b4f24a6361 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -159,13 +159,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CyrTranslit", "..\plugins\C
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_modern", "..\plugins\Clist_modern\clist_modern_10.vcxproj", "{D9057E63-AAAA-4FE7-800A-20C02F4761F3}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EkHtml", "..\plugins\MirOTR\ekhtml\EkHtml_10.vcxproj", "{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EkHtml", "..\plugins\MirOTR\ekhtml\ekhtml_10.vcxproj", "{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libgcrypt", "..\plugins\MirOTR\libgcrypt-1.4.6\libgcrypt146lib_10.vcxproj", "{40FE7861-E54E-4DA9-BE4D-A5178014E477}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libgcrypt", "..\plugins\MirOTR\Libgcrypt\Libgcrypt_10.vcxproj", "{40FE7861-E54E-4DA9-BE4D-A5178014E477}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libotr", "..\plugins\MirOTR\libotr-3.2.0\libotr320_10.vcxproj", "{1423FC8F-AA52-4562-8275-4BF0838CA378}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libotr", "..\plugins\MirOTR\libotr\libotr_10.vcxproj", "{1423FC8F-AA52-4562-8275-4BF0838CA378}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirOTR", "..\plugins\MirOTR\MirOTR\MirOTR_10.vcxproj", "{53F841E8-284F-4545-9176-B131896E43F8}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirOTR", "..\plugins\MirOTR\MirOTR_10.vcxproj", "{53F841E8-284F-4545-9176-B131896E43F8}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewEventNotify", "..\plugins\NewEventNotify\neweventnotify_10.vcxproj", "{2E0A2793-94C3-82E7-2AB0-FD421816CFBF}"

 EndProject

diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln
index f593c08daf..74df739cf0 100644
--- a/bin12/mir_dev.sln
+++ b/bin12/mir_dev.sln
@@ -191,13 +191,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_modern", "..\plugins\
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Toolbar_icons", "..\plugins\Clist_modern\icons_pack\Toolbar_icons_12.vcxproj", "{796B43EF-DACE-4145-8571-31886F45A2C0}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirOTR", "..\plugins\MirOTR\MirOTR\MirOTR_12.vcxproj", "{53F841E8-284F-4545-9176-B131896E43F8}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirOTR", "..\plugins\MirOTR\MirOTR_12.vcxproj", "{53F841E8-284F-4545-9176-B131896E43F8}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libotr", "..\plugins\MirOTR\libotr-3.2.0\libotr320_12.vcxproj", "{1423FC8F-AA52-4562-8275-4BF0838CA378}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libotr", "..\plugins\MirOTR\libotr\libotr_12.vcxproj", "{1423FC8F-AA52-4562-8275-4BF0838CA378}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libgcrypt", "..\plugins\MirOTR\libgcrypt-1.4.6\libgcrypt146lib_12.vcxproj", "{40FE7861-E54E-4DA9-BE4D-A5178014E477}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libgcrypt", "..\plugins\MirOTR\Libgcrypt\Libgcrypt_12.vcxproj", "{40FE7861-E54E-4DA9-BE4D-A5178014E477}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EkHtml", "..\plugins\MirOTR\ekhtml\EkHtml_12.vcxproj", "{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EkHtml", "..\plugins\MirOTR\ekhtml\ekhtml_12.vcxproj", "{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewEventNotify", "..\plugins\NewEventNotify\neweventnotify_12.vcxproj", "{2E0A2793-94C3-82E7-2AB0-FD421816CFBF}"

 EndProject

diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln
index a8ee765a3c..9ae1ee68e8 100644
--- a/bin12/mir_full.sln
+++ b/bin12/mir_full.sln
@@ -161,13 +161,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CyrTranslit", "..\plugins\C
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_modern", "..\plugins\Clist_modern\clist_modern_12.vcxproj", "{D9057E63-AAAA-4FE7-800A-20C02F4761F3}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EkHtml", "..\plugins\MirOTR\ekhtml\EkHtml_12.vcxproj", "{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EkHtml", "..\plugins\MirOTR\ekhtml\ekhtml_12.vcxproj", "{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libgcrypt", "..\plugins\MirOTR\libgcrypt-1.4.6\libgcrypt146lib_12.vcxproj", "{40FE7861-E54E-4DA9-BE4D-A5178014E477}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libgcrypt", "..\plugins\MirOTR\Libgcrypt\Libgcrypt_12.vcxproj", "{40FE7861-E54E-4DA9-BE4D-A5178014E477}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libotr", "..\plugins\MirOTR\libotr-3.2.0\libotr320_12.vcxproj", "{1423FC8F-AA52-4562-8275-4BF0838CA378}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libotr", "..\plugins\MirOTR\libotr\libotr_12.vcxproj", "{1423FC8F-AA52-4562-8275-4BF0838CA378}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirOTR", "..\plugins\MirOTR\MirOTR\MirOTR_12.vcxproj", "{53F841E8-284F-4545-9176-B131896E43F8}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirOTR", "..\plugins\MirOTR\MirOTR_12.vcxproj", "{53F841E8-284F-4545-9176-B131896E43F8}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewEventNotify", "..\plugins\NewEventNotify\neweventnotify_12.vcxproj", "{2E0A2793-94C3-82E7-2AB0-FD421816CFBF}"

 EndProject

diff --git a/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj b/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj
index c2bc078d39..406b566074 100644
--- a/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj
+++ b/plugins/MirOTR/Libgcrypt/Libgcrypt_10.vcxproj
@@ -71,7 +71,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Full</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <FloatingPointModel>Fast</FloatingPointModel>

@@ -85,7 +85,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <ClCompile>

       <Optimization>Full</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <FloatingPointModel>Fast</FloatingPointModel>

@@ -99,7 +99,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -114,7 +114,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -198,14 +198,14 @@
     <ClCompile Include="random\random.c" />

     <ClCompile Include="random\rndhw.c" />

     <ClCompile Include="random\rndw32.c" />

-    <ClCompile Include="..\libgpg-error-1.9\code-from-errno.c" />

-    <ClCompile Include="..\libgpg-error-1.9\code-to-errno.c" />

-    <ClCompile Include="..\libgpg-error-1.9\init.c" />

-    <ClCompile Include="..\libgpg-error-1.9\mkerrcodes.c" />

-    <ClCompile Include="..\libgpg-error-1.9\strerror-sym.c" />

-    <ClCompile Include="..\libgpg-error-1.9\strerror.c" />

-    <ClCompile Include="..\libgpg-error-1.9\strsource-sym.c" />

-    <ClCompile Include="..\libgpg-error-1.9\strsource.c" />

+    <ClCompile Include="..\Libgpg-error\code-from-errno.c" />

+    <ClCompile Include="..\Libgpg-error\code-to-errno.c" />

+    <ClCompile Include="..\Libgpg-error\init.c" />

+    <ClCompile Include="..\Libgpg-error\mkerrcodes.c" />

+    <ClCompile Include="..\Libgpg-error\strerror-sym.c" />

+    <ClCompile Include="..\Libgpg-error\strerror.c" />

+    <ClCompile Include="..\Libgpg-error\strsource-sym.c" />

+    <ClCompile Include="..\Libgpg-error\strsource.c" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="cipher\bithelp.h" />

@@ -234,17 +234,17 @@
     <ClInclude Include="custom\config.h" />

     <ClInclude Include="random\rand-internal.h" />

     <ClInclude Include="random\random.h" />

-    <ClInclude Include="..\libgpg-error-1.9\code-from-errno.h" />

-    <ClInclude Include="..\libgpg-error-1.9\code-to-errno.h" />

-    <ClInclude Include="..\libgpg-error-1.9\err-codes-sym.h" />

-    <ClInclude Include="..\libgpg-error-1.9\err-codes.h" />

-    <ClInclude Include="..\libgpg-error-1.9\err-sources-sym.h" />

-    <ClInclude Include="..\libgpg-error-1.9\err-sources.h" />

-    <ClInclude Include="..\libgpg-error-1.9\errnos-sym.h" />

-    <ClInclude Include="..\libgpg-error-1.9\gettext.h" />

-    <ClInclude Include="..\libgpg-error-1.9\gpg-error.h" />

-    <ClInclude Include="..\libgpg-error-1.9\init.h" />

-    <ClInclude Include="..\libgpg-error-1.9\mkerrcodes.h" />

+    <ClInclude Include="..\Libgpg-error\code-from-errno.h" />

+    <ClInclude Include="..\Libgpg-error\code-to-errno.h" />

+    <ClInclude Include="..\Libgpg-error\err-codes-sym.h" />

+    <ClInclude Include="..\Libgpg-error\err-codes.h" />

+    <ClInclude Include="..\Libgpg-error\err-sources-sym.h" />

+    <ClInclude Include="..\Libgpg-error\err-sources.h" />

+    <ClInclude Include="..\Libgpg-error\errnos-sym.h" />

+    <ClInclude Include="..\Libgpg-error\gettext.h" />

+    <ClInclude Include="..\Libgpg-error\gpg-error.h" />

+    <ClInclude Include="..\Libgpg-error\init.h" />

+    <ClInclude Include="..\Libgpg-error\mkerrcodes.h" />

   </ItemGroup>

   <ItemGroup>

     <None Include="src\libgcrypt.def" />

diff --git a/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj b/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj
index d53aeb56a2..4e2c023d31 100644
--- a/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj
+++ b/plugins/MirOTR/Libgcrypt/Libgcrypt_12.vcxproj
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>Full</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <FloatingPointModel>Fast</FloatingPointModel>

@@ -85,7 +85,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <ClCompile>

       <Optimization>Full</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <FloatingPointModel>Fast</FloatingPointModel>

@@ -95,7 +95,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -106,7 +106,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;cipher;mpi;mpi\generic;src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -186,14 +186,14 @@
     <ClCompile Include="random\random.c" />

     <ClCompile Include="random\rndhw.c" />

     <ClCompile Include="random\rndw32.c" />

-    <ClCompile Include="..\libgpg-error-1.9\code-from-errno.c" />

-    <ClCompile Include="..\libgpg-error-1.9\code-to-errno.c" />

-    <ClCompile Include="..\libgpg-error-1.9\init.c" />

-    <ClCompile Include="..\libgpg-error-1.9\mkerrcodes.c" />

-    <ClCompile Include="..\libgpg-error-1.9\strerror-sym.c" />

-    <ClCompile Include="..\libgpg-error-1.9\strerror.c" />

-    <ClCompile Include="..\libgpg-error-1.9\strsource-sym.c" />

-    <ClCompile Include="..\libgpg-error-1.9\strsource.c" />

+    <ClCompile Include="..\Libgpg-error\code-from-errno.c" />

+    <ClCompile Include="..\Libgpg-error\code-to-errno.c" />

+    <ClCompile Include="..\Libgpg-error\init.c" />

+    <ClCompile Include="..\Libgpg-error\mkerrcodes.c" />

+    <ClCompile Include="..\Libgpg-error\strerror-sym.c" />

+    <ClCompile Include="..\Libgpg-error\strerror.c" />

+    <ClCompile Include="..\Libgpg-error\strsource-sym.c" />

+    <ClCompile Include="..\Libgpg-error\strsource.c" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="cipher\bithelp.h" />

@@ -222,17 +222,17 @@
     <ClInclude Include="custom\config.h" />

     <ClInclude Include="random\rand-internal.h" />

     <ClInclude Include="random\random.h" />

-    <ClInclude Include="..\libgpg-error-1.9\code-from-errno.h" />

-    <ClInclude Include="..\libgpg-error-1.9\code-to-errno.h" />

-    <ClInclude Include="..\libgpg-error-1.9\err-codes-sym.h" />

-    <ClInclude Include="..\libgpg-error-1.9\err-codes.h" />

-    <ClInclude Include="..\libgpg-error-1.9\err-sources-sym.h" />

-    <ClInclude Include="..\libgpg-error-1.9\err-sources.h" />

-    <ClInclude Include="..\libgpg-error-1.9\errnos-sym.h" />

-    <ClInclude Include="..\libgpg-error-1.9\gettext.h" />

-    <ClInclude Include="..\libgpg-error-1.9\gpg-error.h" />

-    <ClInclude Include="..\libgpg-error-1.9\init.h" />

-    <ClInclude Include="..\libgpg-error-1.9\mkerrcodes.h" />

+    <ClInclude Include="..\Libgpg-error\code-from-errno.h" />

+    <ClInclude Include="..\Libgpg-error\code-to-errno.h" />

+    <ClInclude Include="..\Libgpg-error\err-codes-sym.h" />

+    <ClInclude Include="..\Libgpg-error\err-codes.h" />

+    <ClInclude Include="..\Libgpg-error\err-sources-sym.h" />

+    <ClInclude Include="..\Libgpg-error\err-sources.h" />

+    <ClInclude Include="..\Libgpg-error\errnos-sym.h" />

+    <ClInclude Include="..\Libgpg-error\gettext.h" />

+    <ClInclude Include="..\Libgpg-error\gpg-error.h" />

+    <ClInclude Include="..\Libgpg-error\init.h" />

+    <ClInclude Include="..\Libgpg-error\mkerrcodes.h" />

   </ItemGroup>

   <ItemGroup>

     <None Include="src\libgcrypt.def" />

diff --git a/plugins/MirOTR/MirOTR_10.vcxproj b/plugins/MirOTR/MirOTR_10.vcxproj
index 43c166759b..dbaa43317d 100644
--- a/plugins/MirOTR/MirOTR_10.vcxproj
+++ b/plugins/MirOTR/MirOTR_10.vcxproj
@@ -72,7 +72,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;libotr\src;Libgcrypt\src;Libgpg-error;ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -87,17 +87,17 @@
       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\bin10\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;libotr\src;Libgcrypt\src;Libgpg-error;ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -111,11 +111,11 @@
       <SubSystem>Windows</SubSystem>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\bin10\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -123,7 +123,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;libotr\src;Libgcrypt\src;Libgpg-error;ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -140,12 +140,12 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\bin10\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

     </Link>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -153,7 +153,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;libotr\src;Libgcrypt\src;Libgpg-error;ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -170,12 +170,12 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\bin10\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

     </Link>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

@@ -219,13 +219,13 @@
     <ResourceCompile Include="res\version.rc" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\ekhtml\EkHtml_10.vcxproj">

+    <ProjectReference Include="ekhtml\ekhtml_10.vcxproj">

       <Project>{2c050caf-d8aa-468a-b1a7-89f3be99d3c8}</Project>

     </ProjectReference>

-    <ProjectReference Include="..\libgcrypt-1.4.6\libgcrypt146lib_10.vcxproj">

+    <ProjectReference Include="Libgcrypt\Libgcrypt_10.vcxproj">

       <Project>{40fe7861-e54e-4da9-be4d-a5178014e477}</Project>

     </ProjectReference>

-    <ProjectReference Include="..\libotr-3.2.0\libotr320_10.vcxproj">

+    <ProjectReference Include="libotr\libotr_10.vcxproj">

       <Project>{1423fc8f-aa52-4562-8275-4bf0838ca378}</Project>

     </ProjectReference>

   </ItemGroup>

diff --git a/plugins/MirOTR/MirOTR_12.vcxproj b/plugins/MirOTR/MirOTR_12.vcxproj
index ac266acf14..3495612d8b 100644
--- a/plugins/MirOTR/MirOTR_12.vcxproj
+++ b/plugins/MirOTR/MirOTR_12.vcxproj
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;libotr\src;Libgcrypt\src;Libgpg-error;ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -91,18 +91,18 @@
       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\bin12\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

     </Link>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;libotr\src;Libgcrypt\src;Libgpg-error;ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -116,11 +116,11 @@
       <SubSystem>Windows</SubSystem>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\bin12\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -128,7 +128,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;libotr\src;Libgcrypt\src;Libgpg-error;ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -145,11 +145,11 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\bin12\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -157,7 +157,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;libotr\src;Libgcrypt\src;Libgpg-error;ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -174,11 +174,11 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\bin12\lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

@@ -222,13 +222,13 @@
     <ResourceCompile Include="res\version.rc" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\ekhtml\EkHtml_12.vcxproj">

+    <ProjectReference Include="ekhtml\ekhtml_12.vcxproj">

       <Project>{2c050caf-d8aa-468a-b1a7-89f3be99d3c8}</Project>

     </ProjectReference>

-    <ProjectReference Include="..\libgcrypt-1.4.6\libgcrypt146lib_12.vcxproj">

+    <ProjectReference Include="Libgcrypt\Libgcrypt_12.vcxproj">

       <Project>{40fe7861-e54e-4da9-be4d-a5178014e477}</Project>

     </ProjectReference>

-    <ProjectReference Include="..\libotr-3.2.0\libotr320_12.vcxproj">

+    <ProjectReference Include="libotr\libotr_12.vcxproj">

       <Project>{1423fc8f-aa52-4562-8275-4bf0838ca378}</Project>

     </ProjectReference>

   </ItemGroup>

diff --git a/plugins/MirOTR/libotr/libotr_10.vcxproj b/plugins/MirOTR/libotr/libotr_10.vcxproj
index 55da261572..1a8511e061 100644
--- a/plugins/MirOTR/libotr/libotr_10.vcxproj
+++ b/plugins/MirOTR/libotr/libotr_10.vcxproj
@@ -20,7 +20,7 @@
   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectGuid>{1423FC8F-AA52-4562-8275-4BF0838CA378}</ProjectGuid>

-    <ProjectName>Libotr</ProjectName>

+    <ProjectName>libotr</ProjectName>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -71,7 +71,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -88,7 +88,7 @@
     <ClCompile>

       <AdditionalOptions>/D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -103,7 +103,7 @@
     <ClCompile>

       <AdditionalOptions>/D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Full</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <FloatingPointModel>Fast</FloatingPointModel>

@@ -118,7 +118,7 @@
     <ClCompile>

       <AdditionalOptions>/D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Full</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <FloatingPointModel>Fast</FloatingPointModel>

@@ -160,7 +160,7 @@
     <ClInclude Include="custom\config.h" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\libgcrypt-1.4.6\libgcrypt146lib_10.vcxproj">

+    <ProjectReference Include="..\Libgcrypt\Libgcrypt_10.vcxproj">

       <Project>{40fe7861-e54e-4da9-be4d-a5178014e477}</Project>

     </ProjectReference>

   </ItemGroup>

diff --git a/plugins/MirOTR/libotr/libotr_12.vcxproj b/plugins/MirOTR/libotr/libotr_12.vcxproj
index 3a4ecf7dc9..df451b75a9 100644
--- a/plugins/MirOTR/libotr/libotr_12.vcxproj
+++ b/plugins/MirOTR/libotr/libotr_12.vcxproj
@@ -20,7 +20,7 @@
   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectGuid>{1423FC8F-AA52-4562-8275-4BF0838CA378}</ProjectGuid>

-    <ProjectName>Libotr</ProjectName>

+    <ProjectName>libotr</ProjectName>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -88,7 +88,7 @@
     <ClCompile>

       <AdditionalOptions>/D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -99,7 +99,7 @@
     <ClCompile>

       <AdditionalOptions>/D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Full</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <FloatingPointModel>Fast</FloatingPointModel>

@@ -110,7 +110,7 @@
     <ClCompile>

       <AdditionalOptions>/D "WIN32_LEAN_AND_MEAN" %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Full</Optimization>

-      <AdditionalIncludeDirectories>custom;inc;src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>custom;inc;src;..\Libgcrypt\src;..\Libgpg-error;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

       <FloatingPointModel>Fast</FloatingPointModel>

@@ -148,7 +148,7 @@
     <ClInclude Include="custom\config.h" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\libgcrypt-1.4.6\libgcrypt146lib_12.vcxproj">

+    <ProjectReference Include="..\Libgcrypt\Libgcrypt_10.vcxproj">

       <Project>{40fe7861-e54e-4da9-be4d-a5178014e477}</Project>

     </ProjectReference>

   </ItemGroup>