Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-22 15:59:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow passing custom CONFIG options to msys2 buildscript

Browse Source 
Use all cores
This commit is contained in:
hunbernd 2018-12-31 21:36:09 +01:00
parent 18c5ab8913
commit 3822d277ad
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_scripts/Windows-msys2/build/build.bat
View File

@ -48,7 +48,7 @@ echo.
title Build - %SourceName%-%RsBuildConfig% [qmake] title Build - %SourceName%-%RsBuildConfig% [qmake]
set RS_QMAKE_CONFIG="CONFIG+=%RsBuildConfig%" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=%RsBuildConfig%"
if "%ParamAutologin%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=rs_autologin" if "%ParamAutologin%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=rs_autologin"
if "%ParamPlugins%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=retroshare_plugins" if "%ParamPlugins%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=retroshare_plugins"
@ -63,7 +63,7 @@ echo.
title Build - %SourceName%-%RsBuildConfig% [make] title Build - %SourceName%-%RsBuildConfig% [make]
%EnvMSYS2Cmd% "make -j 4" %EnvMSYS2Cmd% "make -j %NUMBER_OF_PROCESSORS%"
:error :error
popd popd

3
build_scripts/Windows-msys2/build/env-base.bat
View File

@ -6,6 +6,7 @@ set ParamDebug=0
set ParamAutologin=0 set ParamAutologin=0
set ParamPlugins=0 set ParamPlugins=0
set ParamTor=0 set ParamTor=0
set RS_QMAKE_CONFIG=
:parameter_loop :parameter_loop
if "%~1" NEQ "" ( if "%~1" NEQ "" (
@ -24,6 +25,8 @@ if "%~1" NEQ "" (
set ParamPlugins=1 set ParamPlugins=1
) else if "%%~a"=="tor" ( ) else if "%%~a"=="tor" (
set ParamTor=1 set ParamTor=1
) else if "%%~a"=="CONFIG+" (
set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% %1
) else ( ) else (
echo. echo.
echo Unknown parameter %1 echo Unknown parameter %1