master #136

Merged
andrey merged 12 commits from master into release 2022-03-23 16:28:12 +03:00
Showing only changes of commit 7a6761dc7a - Show all commits

View File

@@ -5,11 +5,11 @@ if defined SDK_JOBS_COUNT (
) else ( ) else (
set JOBS_COUNT=4 set JOBS_COUNT=4
) )
set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_QT4_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin
if defined SDK_QT5_DIR set Qt5_DIR=%SDK_QT5_DIR%%ARCH% if defined SDK_QT5_DIR set Qt5_DIR=%SDK_QT5_DIR%%ARCH%
if not exist ..\shstk_build_win%ARCH% mkdir ..\shstk_build_win%ARCH% if not exist ..\shstk_build_win%ARCH% mkdir ..\shstk_build_win%ARCH%
cd ..\shstk_build_win%ARCH% && ^ cd ..\shstk_build_win%ARCH% && ^
cmake_mgw -DQGLVIEW=1 -DQGLENGINE=1 -DQT4=0 ../shstk && ^ cmake -G "MinGW Makefiles" -DQGLVIEW=1 -DQGLENGINE=1 -DQT4=0 ../shstk && ^
make install -j%JOBS_COUNT% && ^ make install -j%JOBS_COUNT% && ^
cd ..\shstk && ^ cd ..\shstk && ^
pause pause