aboutsummaryrefslogtreecommitdiff
path: root/make-msvc.bat
diff options
context:
space:
mode:
authorLadislav Zezula <ladislav.zezula@avast.com>2021-12-17 23:42:52 +0100
committerLadislav Zezula <ladislav.zezula@avast.com>2021-12-17 23:42:52 +0100
commit3424ac8ba449b6036d49fd28725f6a2d7c4548e9 (patch)
treebdaf20551f5508b1c59d99e2dd169d8a1751ddcd /make-msvc.bat
parent4f4f926c1a3347f7ecd18f549c4be0a1e62413ba (diff)
Finalizing
Diffstat (limited to 'make-msvc.bat')
-rw-r--r--make-msvc.bat33
1 files changed, 22 insertions, 11 deletions
diff --git a/make-msvc.bat b/make-msvc.bat
index 8b9a559..d8097d1 100644
--- a/make-msvc.bat
+++ b/make-msvc.bat
@@ -21,8 +21,8 @@ if exist "%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2019\Professional\VC\Auxil
if exist "%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" set VCVARS_2019=%PROGRAM_FILES_DIR%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
::Build all libraries using Visual Studio 2008 and 2017
-call :BuildLibs "%VCVARS_2008%" x86 %LIB_NAME%_vs08.sln
-call :BuildLibs "%VCVARS_2008%" x64 %LIB_NAME%_vs08.sln
+call :BuildLibs "%VCVARS_2008%" x86 %LIB_NAME%_vs08.sln \vs2008
+call :BuildLibs "%VCVARS_2008%" x64 %LIB_NAME%_vs08.sln \vs2008
call :BuildLibs "%VCVARS_2019%" x86 %LIB_NAME%_vs19.sln
call :BuildLibs "%VCVARS_2019%" x64 %LIB_NAME%_vs19.sln
goto:eof
@@ -35,21 +35,31 @@ goto:eof
:: %1 Full path to the VCVARS.BAT file
:: %2 Target build platform (x86 or x64)
:: %3 Plain name of the /sln solution file
+:: %4 Subdirectory for the target folder of the library ("\vs2008" or "")
::
:BuildLibs
-::set VSCMD_DEBUG=1
call %1 %2
if "%2" == "x86" set SLN_TRG=Win32
+if "%2" == "x86" set LIB_TRG=lib32
if "%2" == "x64" set SLN_TRG=x64
-devenv.com %3 /project "%LIB_NAME%" /build "DebugAD|%SLN_TRG%"
-devenv.com %3 /project "%LIB_NAME%" /build "DebugAS|%SLN_TRG%"
-devenv.com %3 /project "%LIB_NAME%" /build "DebugUD|%SLN_TRG%"
-devenv.com %3 /project "%LIB_NAME%" /build "DebugUS|%SLN_TRG%"
-devenv.com %3 /project "%LIB_NAME%" /build "ReleaseAD|%SLN_TRG%"
-devenv.com %3 /project "%LIB_NAME%" /build "ReleaseAS|%SLN_TRG%"
-devenv.com %3 /project "%LIB_NAME%" /build "ReleaseUD|%SLN_TRG%"
-devenv.com %3 /project "%LIB_NAME%" /build "ReleaseUS|%SLN_TRG%"
+if "%2" == "x64" set LIB_TRG=lib64
+devenv.com %3 /project "%LIB_NAME%" /rebuild "DebugAD|%SLN_TRG%"
+xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\DebugAD\*.lib ..\aaa\%LIB_TRG%%4
+devenv.com %3 /project "%LIB_NAME%" /rebuild "DebugAS|%SLN_TRG%"
+xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\DebugAS\*.lib ..\aaa\%LIB_TRG%%4
+devenv.com %3 /project "%LIB_NAME%" /rebuild "DebugUD|%SLN_TRG%"
+xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\DebugUD\*.lib ..\aaa\%LIB_TRG%%4
+devenv.com %3 /project "%LIB_NAME%" /rebuild "DebugUS|%SLN_TRG%"
+xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\DebugUS\*.lib ..\aaa\%LIB_TRG%%4
+devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseAD|%SLN_TRG%"
+xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\ReleaseAD\*.lib ..\aaa\%LIB_TRG%%4
+devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseAS|%SLN_TRG%"
+xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\ReleaseAS\*.lib ..\aaa\%LIB_TRG%%4
+devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseUD|%SLN_TRG%"
+xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\ReleaseUD\*.lib ..\aaa\%LIB_TRG%%4
+devenv.com %3 /project "%LIB_NAME%" /rebuild "ReleaseUS|%SLN_TRG%"
+xcopy.exe /Y /D .\bin\StormLib\%SLN_TRG%\ReleaseUS\*.lib ..\aaa\%LIB_TRG%%4
:: Restore environment variables to the old level
set INCLUDE=%SAVE_INCLUDE%
@@ -58,3 +68,4 @@ set PATH=%SAVE_PATH%
set VSINSTALLDIR=
set VCINSTALLDIR=
set DevEnvDir=
+goto:eof