From 8f5e3beab6bc78fe6b9bb72780cef8345936cf0a Mon Sep 17 00:00:00 2001
From: jcmichelou <jean-claude.michelou@spinetix.com>
Date: Wed, 25 Apr 2018 17:09:37 +0200
Subject: [PATCH] win32: Change DLL version number to 2-openssl

---
 win32/install/install.vcxproj | 16 ++++++++--------
 win32/libcoap.vcxproj         |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/win32/install/install.vcxproj b/win32/install/install.vcxproj
index 5694bfa9..56eaed15 100644
--- a/win32/install/install.vcxproj
+++ b/win32/install/install.vcxproj
@@ -169,9 +169,9 @@ copy "$(SolutionDir)$(Configuration)\libcoap$(DbgSuffix).pdb" "$(OutDir)lib"</Co
       <Command>if not exist "$(OutDir)include\coap" mkdir "$(OutDir)include\coap"
 copy "$(SolutionDir)..\include\coap\*.h" "$(OutDir)include\coap"
 if not exist "$(OutDir)bin" mkdir "$(OutDir)bin"
-for %%f in ( coap-client$(DbgSuffix).exe coap-client$(DbgSuffix).pdb coap-server$(DbgSuffix).exe coap-server$(DbgSuffix).pdb coap-rd$(DbgSuffix).exe coap-rd$(DbgSuffix).pdb libcoap-1$(DbgSuffix).dll libcoap-1$(DbgSuffix).pdb ) do copy "$(SolutionDir)$(Configuration)\%%f" "$(OutDir)bin"
+for %%f in ( coap-client$(DbgSuffix).exe coap-client$(DbgSuffix).pdb coap-server$(DbgSuffix).exe coap-server$(DbgSuffix).pdb coap-rd$(DbgSuffix).exe coap-rd$(DbgSuffix).pdb libcoap-2$(DbgSuffix)-openssl.dll libcoap-2$(DbgSuffix)-openssl.pdb ) do copy "$(SolutionDir)$(Configuration)\%%f" "$(OutDir)bin"
 if not exist "$(OutDir)lib" mkdir "$(OutDir)lib"
-copy "$(SolutionDir)$(Configuration)\libcoap-1$(DbgSuffix).lib" "$(OutDir)lib"
+copy "$(SolutionDir)$(Configuration)\libcoap-2$(DbgSuffix)-openssl.lib" "$(OutDir)lib"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -193,9 +193,9 @@ copy "$(SolutionDir)$(Configuration)\libcoap.pdb" "$(OutDir)lib"</Command>
       <Command>if not exist "$(OutDir)include\coap" mkdir "$(OutDir)include\coap"
 copy "$(SolutionDir)..\include\coap\*.h" "$(OutDir)include\coap"
 if not exist "$(OutDir)bin" mkdir "$(OutDir)bin"
-for %%f in ( coap-client.exe coap-client.pdb coap-server.exe coap-server.pdb coap-rd.exe coap-rd.pdb libcoap-1.dll libcoap-1.pdb ) do copy "$(SolutionDir)$(Configuration)\%%f" "$(OutDir)bin"
+for %%f in ( coap-client.exe coap-client.pdb coap-server.exe coap-server.pdb coap-rd.exe coap-rd.pdb libcoap-2-openssl.dll libcoap-2-openssl.pdb ) do copy "$(SolutionDir)$(Configuration)\%%f" "$(OutDir)bin"
 if not exist "$(OutDir)lib" mkdir "$(OutDir)lib"
-copy "$(SolutionDir)$(Configuration)\libcoap-1.lib" "$(OutDir)lib"
+copy "$(SolutionDir)$(Configuration)\libcoap-2-openssl.lib" "$(OutDir)lib"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -216,9 +216,9 @@ copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap$(DbgSuffix).pdb" "$(Out
       <Command>if not exist "$(OutDir)include\coap" mkdir "$(OutDir)include\coap"
 copy "$(SolutionDir)..\include\coap\*.h" "$(OutDir)include\coap"
 if not exist "$(OutDir)bin" mkdir "$(OutDir)bin"
-for %%f in ( coap-client$(DbgSuffix).exe coap-client$(DbgSuffix).pdb coap-server$(DbgSuffix).exe coap-server$(DbgSuffix).pdb coap-rd$(DbgSuffix).exe coap-rd$(DbgSuffix).pdb libcoap-1$(DbgSuffix).dll libcoap-1$(DbgSuffix).pdb ) do copy "$(SolutionDir)$(Platform)\$(Configuration)\%%f" "$(OutDir)bin"
+for %%f in ( coap-client$(DbgSuffix).exe coap-client$(DbgSuffix).pdb coap-server$(DbgSuffix).exe coap-server$(DbgSuffix).pdb coap-rd$(DbgSuffix).exe coap-rd$(DbgSuffix).pdb libcoap-2$(DbgSuffix)-openssl.dll libcoap-2$(DbgSuffix)-openssl.pdb ) do copy "$(SolutionDir)$(Platform)\$(Configuration)\%%f" "$(OutDir)bin"
 if not exist "$(OutDir)lib" mkdir "$(OutDir)lib"
-copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap-1$(DbgSuffix).lib" "$(OutDir)lib"
+copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap-2$(DbgSuffix)-openssl.lib" "$(OutDir)lib"
 </Command>
       <Message>Installing</Message>
     </PostBuildEvent>
@@ -240,9 +240,9 @@ copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap.pdb" "$(OutDir)lib"</Co
       <Command>if not exist "$(OutDir)include\coap" mkdir "$(OutDir)include\coap"
 copy "$(SolutionDir)..\include\coap\*.h" "$(OutDir)include\coap"
 if not exist "$(OutDir)bin" mkdir "$(OutDir)bin"
-for %%f in ( coap-client.exe coap-client.pdb coap-server.exe coap-server.pdb coap-rd.exe coap-rd.pdb libcoap-1.dll libcoap-1.pdb ) do copy "$(SolutionDir)$(Platform)\$(Configuration)\%%f" "$(OutDir)bin"
+for %%f in ( coap-client.exe coap-client.pdb coap-server.exe coap-server.pdb coap-rd.exe coap-rd.pdb libcoap-2-openssl.dll libcoap-2-openssl.pdb ) do copy "$(SolutionDir)$(Platform)\$(Configuration)\%%f" "$(OutDir)bin"
 if not exist "$(OutDir)lib" mkdir "$(OutDir)lib"
-copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap-1.lib" "$(OutDir)lib"
+copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap-2-openssl.lib" "$(OutDir)lib"
 </Command>
       <Message>Installing</Message>
     </PostBuildEvent>
diff --git a/win32/libcoap.vcxproj b/win32/libcoap.vcxproj
index 32d17ebc..7d8e45be 100644
--- a/win32/libcoap.vcxproj
+++ b/win32/libcoap.vcxproj
@@ -249,7 +249,7 @@ TYPE %(FullPath) &gt;&gt; "$(IntDir)$(TargetName).def"</Command>
     <LibraryPath>$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">
-    <TargetName>$(ProjectName)-1$(DbgSuffix)</TargetName>
+    <TargetName>$(ProjectName)-2$(DbgSuffix)-openssl</TargetName>
     <CustomBuildBeforeTargets />
     <CustomBuildAfterTargets />
     <IncludePath>$(IncludePath)</IncludePath>
@@ -266,13 +266,13 @@ TYPE %(FullPath) &gt;&gt; "$(IntDir)$(TargetName).def"</Command>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">
     <CustomBuildBeforeTargets />
     <CustomBuildAfterTargets />
-    <TargetName>$(ProjectName)-1</TargetName>
+    <TargetName>$(ProjectName)-2-openssl</TargetName>
     <IncludePath>$(IncludePath)</IncludePath>
     <LibraryPath>$(LibraryPath)</LibraryPath>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">
-    <TargetName>$(ProjectName)-1$(DbgSuffix)</TargetName>
+    <TargetName>$(ProjectName)-2$(DbgSuffix)-openssl</TargetName>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)include</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;$(SolutionDir)lib</LibraryPath>
   </PropertyGroup>
@@ -282,7 +282,7 @@ TYPE %(FullPath) &gt;&gt; "$(IntDir)$(TargetName).def"</Command>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;$(SolutionDir)lib</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'">
-    <TargetName>$(ProjectName)-1</TargetName>
+    <TargetName>$(ProjectName)-2-openssl</TargetName>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)include</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;$(SolutionDir)lib</LibraryPath>
     <LinkIncremental>false</LinkIncremental>