Browse Source

Sync OMF lib existence with result of COFF build

Source commit: 49c2b4a50ae8db70a0306529700e74bd96844dd8
Martin Prikryl 6 years ago
parent
commit
2a23580572
1 changed files with 8 additions and 1 deletions
  1. 8 1
      libs/puttyvs/build.bat

+ 8 - 1
libs/puttyvs/build.bat

@@ -4,5 +4,12 @@ if "%BUILDTOOLS_PATH%" == "" set BUILDTOOLS_PATH=..\..\buildtools
 if "%PROCESSOR_ARCHITECTURE%"=="x86" set PROGRAMFILES32=%ProgramFiles%
 if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set PROGRAMFILES32=%ProgramFiles(x86)%
 
+set COFF_LIB=Release\PuTTYVS.lib
+set OMF_LIB=..\lib\PuTTYVS.lib
+if exist %COFF_LIB% del %COFF_LIB%
+if exist %OMF_LIB% del %OMF_LIB%
+
 "%PROGRAMFILES32%\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe" PuTTYVS.vcxproj /p:Configuration=Release
-%BUILDTOOLS_PATH%\tools\objconv.exe -fomf32 Release\PuTTYVS.lib ..\lib\PuTTYVS.lib
+if exist %COFF_LIB% (
+  %BUILDTOOLS_PATH%\tools\objconv.exe -v2 -fomf32 %COFF_LIB% %OMF_LIB%
+)