From 8fe6151839a61da7e85b1b4f8a568bbe8467dcc2 Mon Sep 17 00:00:00 2001
From: Mladen Turk <mturk@apache.org>
Date: Tue, 19 Oct 2021 13:00:49 +0200
Subject: [PATCH] Upgrade to v15.0_40

---
 CHANGES.md                |  5 +++++
 setenv.bat                |  2 +-
 tools/cmsc15_compile.bat  | 15 ++++++++-------
 tools/cmsc15_versions.bat |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cadbd0e..a441633 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,11 @@ For a full list of changes, see the [git commit log][log]
 
   [log]: https://github.com/mturk/cmsc/commits/
 
+## cmsc 15.0_40
+
+ * Use amd64/lib.exe
+ * Add dumpbin.exe
+
 ## cmsc 15.0_39
 
  * Update cygwrun dependency
diff --git a/setenv.bat b/setenv.bat
index 49f55e7..e2ef43c 100644
--- a/setenv.bat
+++ b/setenv.bat
@@ -26,7 +26,7 @@ if not exist "%CmscRootDir%\msvc\bin\build.exe" (
     exit /B 1
 )
 set "WINVER=0x0601"
-set "CMSC_VERSION=15039"
+set "CMSC_VERSION=15040"
 rem
 rem Default target is 64-bit Windows
 rem
diff --git a/tools/cmsc15_compile.bat b/tools/cmsc15_compile.bat
index fb0010c..16f75fc 100644
--- a/tools/cmsc15_compile.bat
+++ b/tools/cmsc15_compile.bat
@@ -21,10 +21,9 @@ set "VSToolsDir=%cd%"
 popd
 call cmsc15_versions.bat
 rem Prerequisites...
-set "ProgramFiles64=%ProgramFiles%"
 set "WINDDK=c:\WinDDK\7600.16385.1"
-set "WPSDK6=%ProgramFiles64%\Microsoft Platform SDK for Windows Server 2003 R2"
-set "WINSDK=%ProgramFiles64%\Microsoft SDKs\Windows\v7.1"
+set "WPSDK6=%ProgramFiles%\Microsoft Platform SDK for Windows Server 2003 R2"
+set "WINSDK=%ProgramFiles%\Microsoft SDKs\Windows\v7.1"
 set "MSVS09=%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC"
 rem
 set "MSCVCD=dist\msvc"
@@ -103,10 +102,12 @@ rem Copy Binaries
 %FCOPYF% "%WINDDK%\tools\Other\i386\msdis160.dll" bin\msdis160.dll >NUL
 for %%i in (mt guidgen rebase) do copy /Y "%WINSDK%\bin\%%i.exe" bin\ >NUL
 move /Y bin\ml.exe bin\x86\ml.exe >NUL
-rem Copy missing lib.exe from VS2009
-%FCOPYF% "%MSVS09%\bin\pgodb90.dll" bin\pgodb90.dll >NUL
-%FCOPYF% "%MSVS09%\bin\lib.exe" bin\x86\lib.exe >NUL
-%FCOPYF% "%MSVS09%\bin\x86_amd64\lib.exe" bin\x64\lib.exe >NUL
+rem Copy missing lib and dumpbin from VS2009
+rem %FCOPYF% "%MSVS09%\bin\pgodb90.dll" bin\pgodb90.dll >NUL
+for %%i in (lib dumpbin) do (
+    %FCOPYF% "%MSVS09%\bin\%%i.exe" bin\x86\%%i.exe >NUL
+    %FCOPYF% "%MSVS09%\bin\amd64\%%i.exe" bin\x64\%%i.exe >NUL
+)
 rem
 if not exist "%WPSDK6%\include\atl" (
     echo Cannot find "%WPSDK6%" directory >>%VSToolsDir%\compile.log
diff --git a/tools/cmsc15_versions.bat b/tools/cmsc15_versions.bat
index c9022b7..97e323f 100644
--- a/tools/cmsc15_versions.bat
+++ b/tools/cmsc15_versions.bat
@@ -14,7 +14,7 @@ rem limitations under the License.
 rem
 rem Setup environment for Microsoft Compiler Toolkit
 rem
-set "CmscVer=15.0_39"
+set "CmscVer=15.0_40"
 set "CmscSys=64"
 set "CmscOsv=win7"
 set "NasmVer=2.15.05"