Enabled jsonapi in Windows build environment

This commit is contained in:
thunder2 2020-08-11 00:23:25 +02:00
parent 4c4648e3e2
commit f85bf388d2
3 changed files with 6 additions and 1 deletions

View File

@ -13,7 +13,7 @@ call "%~dp0build-libs\build-libs.bat"
if errorlevel 1 %cecho% error "Failed to build libraries." & exit /B %ERRORLEVEL% if errorlevel 1 %cecho% error "Failed to build libraries." & exit /B %ERRORLEVEL%
%cecho% info "Build %SourceName%" %cecho% info "Build %SourceName%"
call "%~dp0build\build.bat" release autologin call "%~dp0build\build.bat" release autologin jsonapi
rem plugins rem plugins
if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL% if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL%

View File

@ -51,6 +51,7 @@ title Build - %SourceName%-%RsBuildConfig% [qmake]
set RS_QMAKE_CONFIG=%RsBuildConfig% set RS_QMAKE_CONFIG=%RsBuildConfig%
if "%ParamAutologin%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_autologin if "%ParamAutologin%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_autologin
if "%ParamJsonApi%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_jsonapi
if "%ParamPlugins%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% retroshare_plugins if "%ParamPlugins%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% retroshare_plugins
qmake "%SourcePath%\RetroShare.pro" -r -spec win32-g++ "CONFIG+=%RS_QMAKE_CONFIG%" "EXTERNAL_LIB_DIR=%BuildLibsPath%\libs" qmake "%SourcePath%\RetroShare.pro" -r -spec win32-g++ "CONFIG+=%RS_QMAKE_CONFIG%" "EXTERNAL_LIB_DIR=%BuildLibsPath%\libs"

View File

@ -3,6 +3,7 @@ set ParamRelease=0
set ParamDebug=0 set ParamDebug=0
set ParamAutologin=0 set ParamAutologin=0
set ParamPlugins=0 set ParamPlugins=0
set ParamJsonApi=0
set ParamTor=0 set ParamTor=0
set NonInteractive=0 set NonInteractive=0
@ -15,6 +16,8 @@ if "%~1" NEQ "" (
set ParamDebug=1 set ParamDebug=1
) else if "%%~a"=="autologin" ( ) else if "%%~a"=="autologin" (
set ParamAutologin=1 set ParamAutologin=1
) else if "%%~a"=="jsonapi" (
set ParamJsonApi=1
) else if "%%~a"=="plugins" ( ) else if "%%~a"=="plugins" (
set ParamPlugins=1 set ParamPlugins=1
) else if "%%~a"=="tor" ( ) else if "%%~a"=="tor" (
@ -97,6 +100,7 @@ echo release^|debug Build release or debug version
echo. echo.
echo Optional parameter (need clean when changed) echo Optional parameter (need clean when changed)
echo autologin Build with autologin echo autologin Build with autologin
echo jsonapi Build with jsonapi
echo plugins Build plugins echo plugins Build plugins
echo. echo.
echo Parameter for pack echo Parameter for pack