Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-25 14:56:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Friendserver support

Browse Source
This commit is contained in:
hunbernd 2022-01-31 01:47:26 +01:00
parent a3f6d516e7
commit 1de12129da
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ set ParamTor=0
set ParamWebui=0 set ParamWebui=0
set ParamClang=0 set ParamClang=0
set ParamIndexing=0 set ParamIndexing=0
set ParamFriendserver=0
set ParamNoupdate=0 set ParamNoupdate=0
set CoreCount=%NUMBER_OF_PROCESSORS% set CoreCount=%NUMBER_OF_PROCESSORS%
set RS_QMAKE_CONFIG= set RS_QMAKE_CONFIG=
@ -58,6 +59,8 @@ if "%~1" NEQ "" (
set ParamClang=1 set ParamClang=1
) else if "%%~a"=="indexing" ( ) else if "%%~a"=="indexing" (
set ParamIndexing=1 set ParamIndexing=1
) else if "%%~a"=="friendserver" (
set ParamFriendserver=1
) else if "%%~a"=="noupdate" ( ) else if "%%~a"=="noupdate" (
set ParamNoupdate=1 set ParamNoupdate=1
) else if "%%~a"=="CONFIG+" ( ) else if "%%~a"=="CONFIG+" (
@ -137,11 +140,15 @@ if "%ParamIndexing%"=="1" (
set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=rs_deep_channels_index" "CONFIG+=rs_deep_files_index" "CONFIG+=rs_deep_files_index_ogg" "CONFIG+=rs_deep_files_index_flac" "CONFIG+=rs_deep_files_index_taglib" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=rs_deep_channels_index" "CONFIG+=rs_deep_files_index" "CONFIG+=rs_deep_files_index_ogg" "CONFIG+=rs_deep_files_index_flac" "CONFIG+=rs_deep_files_index_taglib"
) )
if "%ParamFriendserver%"=="1" (
set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=rs_efs"
)
exit /B 0 exit /B 0
:usage :usage
echo. echo.
echo Usage: 32^|64^|other release^|debug [autologin plugins webui singlethread clang indexing noupdate] ["CONFIG+=..."] echo Usage: 32^|64^|other release^|debug [autologin plugins webui singlethread clang indexing friendserver noupdate] ["CONFIG+=..."]
echo. echo.
echo Mandatory parameter echo Mandatory parameter
echo 32^|64 32-bit or 64-bit version (same as mingw32 or mingw64) echo 32^|64 32-bit or 64-bit version (same as mingw32 or mingw64)
@ -157,6 +164,7 @@ echo webui Enable JsonAPI and pack webui files
echo singlethread Use only 1 thread for building echo singlethread Use only 1 thread for building
echo clang Use clang compiler instead of GCC echo clang Use clang compiler instead of GCC
echo indexing Build with deep channel and file indexing support echo indexing Build with deep channel and file indexing support
echo friendserver Enable friendserver support
echo noupdate Skip updating the libraries echo noupdate Skip updating the libraries
echo "CONFIG+=..." Enable some extra features, you can find the almost complete list in retroshare.pri echo "CONFIG+=..." Enable some extra features, you can find the almost complete list in retroshare.pri
echo. echo.

3
build_scripts/Windows-msys2/build/pack.bat
View File

@ -105,6 +105,9 @@ copy "%RsBuildPath%\retroshare-nogui\src\%RsBuildConfig%\retroshare*-nogui.exe"
copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite% copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
copy "%RsBuildPath%\supportlibs\cmark\build\src\libcmark.dll" "%RsDeployPath%" %Quite% copy "%RsBuildPath%\supportlibs\cmark\build\src\libcmark.dll" "%RsDeployPath%" %Quite%
if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite% if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite%
if exist "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" (
copy "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" "%RsDeployPath%" %Quite%
)
echo copy extensions echo copy extensions
for /D %%D in ("%RsBuildPath%\plugins\*") do ( for /D %%D in ("%RsBuildPath%\plugins\*") do (

1
retroshare-friendserver/src/retroshare-friendserver.pro
View File

@ -44,6 +44,7 @@ unix {
win32-g++|win32-clang-g++ { win32-g++|win32-clang-g++ {
dLib = ws2_32 iphlpapi crypt32 dLib = ws2_32 iphlpapi crypt32
LIBS *= $$linkDynamicLibs(dLib) LIBS *= $$linkDynamicLibs(dLib)
CONFIG += console
} }
################################### COMMON stuff ################################## ################################### COMMON stuff ##################################

7
retroshare-service/src/retroshare-service.pro
View File

@ -87,12 +87,7 @@ macx {
################################# Windows ########################################## ################################# Windows ##########################################
win32-g++|win32-clang-g++ { win32-g++|win32-clang-g++ {
CONFIG(debug, debug|release) { CONFIG += console
# show console output
CONFIG += console
} else {
CONFIG -= console
}
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
} else { } else {