From 166ef51ed155502afe056ab2cb71078c3b00c2c6 Mon Sep 17 00:00:00 2001
From: Jon Shallow <supjps-libcoap@jpshallow.com>
Date: Sun, 10 Oct 2021 20:28:54 +0100
Subject: [PATCH] Windows: Update libcoap-2 objects to libcoap-3

---
 win32/install/install.vcxproj | 20 ++++++++++----------
 win32/libcoap.vcxproj         | 12 ++++++------
 win32/libcoap.vcxproj.filters |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/win32/install/install.vcxproj b/win32/install/install.vcxproj
index 0942975d..01bc00f3 100644
--- a/win32/install/install.vcxproj
+++ b/win32/install/install.vcxproj
@@ -186,9 +186,9 @@ copy "$(SolutionDir)$(Configuration)\libcoap$(DbgSuffix).pdb" "$(OutDir)lib"</Co
       <Command>if not exist "$(OutDir)$(LibCoAPIncludeDir)" mkdir "$(OutDir)$(LibCoAPIncludeDir)"
 copy "$(SolutionDir)..\$(LibCoAPIncludeDir)\*.h" "$(OutDir)$(LibCoAPIncludeDir)"
 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-2$(DbgSuffix)-openssl.dll libcoap-2$(DbgSuffix)-openssl.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-3$(DbgSuffix)-openssl.dll libcoap-3$(DbgSuffix)-openssl.pdb ) do copy "$(SolutionDir)$(Configuration)\%%f" "$(OutDir)bin"
 if not exist "$(OutDir)lib" mkdir "$(OutDir)lib"
-copy "$(SolutionDir)$(Configuration)\libcoap-2$(DbgSuffix)-openssl.lib" "$(OutDir)lib"
+copy "$(SolutionDir)$(Configuration)\libcoap-3$(DbgSuffix)-openssl.lib" "$(OutDir)lib"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -210,9 +210,9 @@ copy "$(SolutionDir)$(Configuration)\libcoap.pdb" "$(OutDir)lib"</Command>
       <Command>if not exist "$(OutDir)$(LibCoAPIncludeDir)" mkdir "$(OutDir)$(LibCoAPIncludeDir)"
 copy "$(SolutionDir)..\$(LibCoAPIncludeDir)\*.h" "$(OutDir)$(LibCoAPIncludeDir)"
 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-2-openssl.dll libcoap-2-openssl.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-3-openssl.dll libcoap-3-openssl.pdb ) do copy "$(SolutionDir)$(Configuration)\%%f" "$(OutDir)bin"
 if not exist "$(OutDir)lib" mkdir "$(OutDir)lib"
-copy "$(SolutionDir)$(Configuration)\libcoap-2-openssl.lib" "$(OutDir)lib"
+copy "$(SolutionDir)$(Configuration)\libcoap-3-openssl.lib" "$(OutDir)lib"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -233,9 +233,9 @@ copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap$(DbgSuffix).pdb" "$(Out
       <Command>if not exist "$(OutDir)$(LibCoAPIncludeDir)" mkdir "$(OutDir)$(LibCoAPIncludeDir)"
 copy "$(SolutionDir)..\$(LibCoAPIncludeDir)\*.h" "$(OutDir)$(LibCoAPIncludeDir)"
 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-2$(DbgSuffix)-openssl.dll libcoap-2$(DbgSuffix)-openssl.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-3$(DbgSuffix)-openssl.dll libcoap-3$(DbgSuffix)-openssl.pdb ) do copy "$(SolutionDir)$(Platform)\$(Configuration)\%%f" "$(OutDir)bin"
 if not exist "$(OutDir)lib" mkdir "$(OutDir)lib"
-copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap-2$(DbgSuffix)-openssl.lib" "$(OutDir)lib"
+copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap-3$(DbgSuffix)-openssl.lib" "$(OutDir)lib"
 </Command>
       <Message>Installing</Message>
     </PostBuildEvent>
@@ -257,9 +257,9 @@ copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap.pdb" "$(OutDir)lib"</Co
       <Command>if not exist "$(OutDir)$(LibCoAPIncludeDir)" mkdir "$(OutDir)$(LibCoAPIncludeDir)"
 copy "$(SolutionDir)..\$(LibCoAPIncludeDir)\*.h" "$(OutDir)$(LibCoAPIncludeDir)"
 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-2-openssl.dll libcoap-2-openssl.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-3-openssl.dll libcoap-3-openssl.pdb ) do copy "$(SolutionDir)$(Platform)\$(Configuration)\%%f" "$(OutDir)bin"
 if not exist "$(OutDir)lib" mkdir "$(OutDir)lib"
-copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap-2-openssl.lib" "$(OutDir)lib"
+copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap-3-openssl.lib" "$(OutDir)lib"
 </Command>
       <Message>Installing</Message>
     </PostBuildEvent>
@@ -271,8 +271,8 @@ copy "$(SolutionDir)..\$(LibCoAPIncludeDir)\*.h" "$(OutDir)$(LibCoAPIncludeDir)"
 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 ) do copy "$(SolutionDir)$(Platform)\$(Configuration)\%%f" "$(OutDir)bin"
 if not exist "$(OutDir)lib" mkdir "$(OutDir)lib"
-copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap-2.lib" "$(OutDir)lib"
-copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap-2.pdb" "$(OutDir)lib"</Command>
+copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap-3.lib" "$(OutDir)lib"
+copy "$(SolutionDir)$(Platform)\$(Configuration)\libcoap-3.pdb" "$(OutDir)lib"</Command>
       <Message>Installing</Message>
     </PostBuildEvent>
   </ItemDefinitionGroup>
diff --git a/win32/libcoap.vcxproj b/win32/libcoap.vcxproj
index 1221795b..e4468a2f 100644
--- a/win32/libcoap.vcxproj
+++ b/win32/libcoap.vcxproj
@@ -104,7 +104,7 @@
     <ClInclude Include="..\$(LibCoAPIncludeDir)\utlist.h" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\libcoap-2.sym">
+    <CustomBuild Include="..\libcoap-3.sym">
       <FileType>Document</FileType>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -285,7 +285,7 @@ TYPE %(FullPath) &gt;&gt; "$(IntDir)$(TargetName).def"</Command>
     <LibraryPath>$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">
-    <TargetName>$(ProjectName)-2$(DbgSuffix)-openssl</TargetName>
+    <TargetName>$(ProjectName)-3$(DbgSuffix)-openssl</TargetName>
     <CustomBuildBeforeTargets />
     <CustomBuildAfterTargets />
     <IncludePath>$(IncludePath)</IncludePath>
@@ -302,13 +302,13 @@ TYPE %(FullPath) &gt;&gt; "$(IntDir)$(TargetName).def"</Command>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'">
     <CustomBuildBeforeTargets />
     <CustomBuildAfterTargets />
-    <TargetName>$(ProjectName)-2-openssl</TargetName>
+    <TargetName>$(ProjectName)-3-openssl</TargetName>
     <IncludePath>$(IncludePath)</IncludePath>
     <LibraryPath>$(LibraryPath)</LibraryPath>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">
-    <TargetName>$(ProjectName)-2$(DbgSuffix)-openssl</TargetName>
+    <TargetName>$(ProjectName)-3$(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>
@@ -318,7 +318,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)-2-openssl</TargetName>
+    <TargetName>$(ProjectName)-3-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>
@@ -328,7 +328,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)'=='NoTLS|x64'">
-    <TargetName>$(ProjectName)-2</TargetName>
+    <TargetName>$(ProjectName)-3</TargetName>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)include</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;$(SolutionDir)lib</LibraryPath>
   </PropertyGroup>
diff --git a/win32/libcoap.vcxproj.filters b/win32/libcoap.vcxproj.filters
index 275332d0..995f8a2b 100644
--- a/win32/libcoap.vcxproj.filters
+++ b/win32/libcoap.vcxproj.filters
@@ -199,6 +199,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\libcoap-2.sym" />
+    <CustomBuild Include="..\libcoap-3.sym" />
   </ItemGroup>
 </Project>