Updated CI scripts 9.

This commit is contained in:
Gonzalo Exequiel Pedone 2021-02-21 02:33:12 -03:00
parent 70da777f25
commit 79b8dfce38
No known key found for this signature in database
GPG key ID: B8B09E63E9B85BAF
2 changed files with 12 additions and 9 deletions

View file

@ -20,27 +20,27 @@ echo.
echo Building x64 virtual camera driver echo Building x64 virtual camera driver
echo. echo.
echo "%PATH%"
set PATH_ORIG="%PATH%"
echo "%PATH%"
mkdir build-x64 mkdir build-x64
cd build-x64 cd build-x64
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" ( if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;"%PATH%" setlocal
set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
cmake ^ cmake ^
-G "%CMAKE_GENERATOR%" ^ -G "%CMAKE_GENERATOR%" ^
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^ -DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
.. ..
cmake --build .
endlocal
) )
if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" ( if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
set PATH="C:\Program Files\CMake\bin;%PATH%"
cmake ^ cmake ^
-G "%CMAKE_GENERATOR%" ^ -G "%CMAKE_GENERATOR%" ^
-A x64 ^ -A x64 ^
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^ -DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
.. ..
cmake --build .
) )
cmake --build . cmake --build .
@ -50,28 +50,29 @@ echo.
echo Building x86 virtual camera driver echo Building x86 virtual camera driver
echo. echo.
set PATH="%PATH_ORIG%"
mkdir build-x86 mkdir build-x86
cd build-x86 cd build-x86
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" ( if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
setlocal
set PATH=C:\msys64\mingw32\bin;C:\msys64\usr\bin;"%PATH%" set PATH=C:\msys64\mingw32\bin;C:\msys64\usr\bin;"%PATH%"
cmake ^ cmake ^
-G "%CMAKE_GENERATOR%" ^ -G "%CMAKE_GENERATOR%" ^
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^ -DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
.. ..
cmake --build .
endlocal
) )
if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" ( if "%CMAKE_GENERATOR:~0,13%" == "Visual Studio" (
set PATH="C:\Program Files\CMake\bin;%PATH%"
cmake ^ cmake ^
-G "%CMAKE_GENERATOR%" ^ -G "%CMAKE_GENERATOR%" ^
-A Win32 ^ -A Win32 ^
-DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^ -DCMAKE_INSTALL_PREFIX="%INSTALL_PREFIX%" ^
.. ..
cmake --build .
) )
cmake --build .
cd .. cd ..
mkdir build-x64\AkVirtualCamera.plugin\x86 mkdir build-x64\AkVirtualCamera.plugin\x86

View file

@ -20,7 +20,8 @@ rem Installing various utilities
choco install -y jfrog-cli choco install -y jfrog-cli
if "%CMAKE_GENERATOR%" == "MSYS Makefiles" ( if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
set PATH=C:\msys64\usr\bin;"%PATH%" setlocal
set PATH=C:\msys64\usr\bin;%PATH%
pacman -Syy pacman -Syy
pacman --noconfirm --needed -S ^ pacman --noconfirm --needed -S ^
cmake ^ cmake ^
@ -32,4 +33,5 @@ if "%CMAKE_GENERATOR%" == "MSYS Makefiles" (
mingw-w64-i686-cmake ^ mingw-w64-i686-cmake ^
mingw-w64-x86_64-pkg-config ^ mingw-w64-x86_64-pkg-config ^
mingw-w64-i686-pkg-config mingw-w64-i686-pkg-config
endlocal
) )