From 98e58ae4c18aecf60db360fe25eaaa9a3c5148c4 Mon Sep 17 00:00:00 2001
From: LammyL <LammyL@users.noreply.github.com>
Date: Thu, 25 May 2017 06:39:18 -0400
Subject: [PATCH] Added version resource files for msvc compiled dlls. (#551)

---
 builds/msvc/resource.h                         |  14 ++++++++++++++
 builds/msvc/resource.rc                        | Bin 0 -> 3742 bytes
 builds/msvc/vs2010/libsodium/libsodium.vcxproj |   7 +++++++
 builds/msvc/vs2012/libsodium/libsodium.vcxproj |   7 +++++++
 builds/msvc/vs2013/libsodium/libsodium.vcxproj |   7 +++++++
 builds/msvc/vs2015/libsodium/libsodium.vcxproj |   7 +++++++
 builds/msvc/vs2017/libsodium/libsodium.vcxproj |  11 +++++++++--
 libsodium.vcxproj                              |   9 ++++++++-
 8 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 builds/msvc/resource.h
 create mode 100644 builds/msvc/resource.rc

diff --git a/builds/msvc/resource.h b/builds/msvc/resource.h
new file mode 100644
index 00000000..7ca31da7
--- /dev/null
+++ b/builds/msvc/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Resource.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/builds/msvc/resource.rc b/builds/msvc/resource.rc
new file mode 100644
index 0000000000000000000000000000000000000000..a3fd0994fe17d2fe2da294df6942299a47b31630
GIT binary patch
literal 3742
zcmdUxTTdE66vxkVlYWOSK2%eKpr)5cFGxudj0?1VA|e+_a3L(zn)I``{hb+x-RYv0
z#x^z^*x8vg=kh;i{&RkO-;o^&<Wz=oDN`9s%&#vq=330fGM5V(@pUAxcmf$nPa=L(
z=4ZUS%uRXgzB!{y#sOcdZ736D^734sVP(g>H<*oB9U<K{vboIuyj)4{PU#z?!P-nD
zosAfqJ@gNW;ucS4=u(fq@IS?`A$~@DN7%oX&SEw|ddzwv-^Ig`ykv)J-Y~xQjb+tV
zm5LlnD0Mkz)C9jac$MUwxeBv2zC&s7U13~iM^1_$QQ%jUJu`9<DhlgqJ~UbbG;O1C
z+i290dipyYCPX<VnmHJ0mLu|bZ4g?GK#WWWnHU+(wMEaNIsqfC1H1Q{^&6w>!sIl-
z#u)7ra2pxy21r<0i>hWR@UZR5rhJvxvM*aEmVkAA9+H7G@Yakpsn!M=sL27DDX}|e
z?01MlV;`E_2PsP~7d<1l%BPRU|2^6LM}EBpgRSK$P`@+-4h==mjUOMG1dYg`)%Pk(
zPx8}yT-^ucJA$RO-eS(aX1U4CkSetm95S-p6@ze=z3hok*XN5&g&xR>e4@h6v8F80
zWOT&1P4!iIRPQ&QY;C)p4QlfoW@xjk#(rDvRc4hhn!L-bDAU*(D_1tm6Uuu|eSqaA
zEOeJdo7M0?%3PAc7MV)8+Rf`*e=VZQvaRy$37OD)E6u}hUUvpaRKTnBi_F9L+_J9K
z<1>wKaeZyhs}qyUGVz^~^-w<GaRD~mgC(mbcD+6Oi)su^wUwxVCbi<nmuRvYip%|u
zN$!^~q~y~akRVvcKdXBmANAQ^>`7!A@>$MI6>Ai4GV8W}eJN-8kbPxy&sk3`+iA7e
zIcbVa4i9G3iS`o%GOKq?j~$V@VJwF^j$ExRSxsxzNDA`KMAYHm*Ocs8<)2%1?-qHi
zk{^2qIUkSlGu<KCo+M|^bdH<Lb}XTHS7|?WYx=1%u`9cEn9+MyyPVC%O!|IP4qEN|
z{oeVf&w90Pzmv|Hv*zADCYmp0<|%LOG;928KjP4^k*4EXC#EWz21f4@XimUN>tz7K
zv!#XXisE@`IDD7<7pdG}nU$<R0s80YyTXF9R(>ti>kE&xiZy;$Bd#yI8;3kRpgrn3
zc${G^>Hd7ISLN8}xum0dcz%70f2+3i4n1CQpslm)jL#h{(4H>Q{u9>l>$rio3vw8f
w5$!J0XIk0Ma*E#CMS4i(%QS|Gx5-G?H>h97zwZ2K@AX(+&eQAToJSh{Pb%N@O#lD@

literal 0
HcmV?d00001

diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
index 98ce00ec..11bef9ce 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
@@ -302,6 +302,13 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\curve25519_ref10.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\mutex.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\sse2_64_32.h" />
+    <ClInclude Include="..\..\resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\resource.rc">
+       <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL'">_DEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>      
+    </ResourceCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
index c3fc0008..f8bcede3 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
@@ -302,6 +302,13 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\curve25519_ref10.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\mutex.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\sse2_64_32.h" />
+    <ClInclude Include="..\..\resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\resource.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL'">_DEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>      
+    </ResourceCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
index f33ab1eb..fd2cb10c 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
@@ -302,6 +302,13 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\curve25519_ref10.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\mutex.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\sse2_64_32.h" />
+    <ClInclude Include="..\..\resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\resource.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL'">_DEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>      
+    </ResourceCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
index a06a6681..127070e8 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
@@ -302,6 +302,13 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\curve25519_ref10.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\mutex.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\sse2_64_32.h" />
+    <ClInclude Include="..\..\resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\resource.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL'">_DEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>      
+    </ResourceCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
index 87208d76..25dbf719 100644
--- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
@@ -181,7 +181,7 @@
     <ClCompile Include="..\..\..\..\src\libsodium\sodium\core.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\sodium\runtime.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\sodium\utils.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\sodium\version.c" />  
+    <ClCompile Include="..\..\..\..\src\libsodium\sodium\version.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base.h" />
@@ -302,6 +302,13 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\curve25519_ref10.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\mutex.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\sse2_64_32.h" />
+    <ClInclude Include="..\..\resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\resource.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL'">_DEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
@@ -324,4 +331,4 @@
       <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/libsodium.vcxproj b/libsodium.vcxproj
index f589e257..8a2ecbbf 100644
--- a/libsodium.vcxproj
+++ b/libsodium.vcxproj
@@ -540,8 +540,15 @@
     <ClInclude Include="src\libsodium\include\sodium\private\curve25519_ref10.h" />
     <ClInclude Include="src\libsodium\include\sodium\private\mutex.h" />
     <ClInclude Include="src\libsodium\include\sodium\private\sse2_64_32.h" />
+    <ClInclude Include="builds\msvc\resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="builds\msvc\resource.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL'">_DEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>      
+    </ResourceCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file