Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1318 from zapek/msys2_build_fix

Browse Source 
fixed webui files generation under MSYS2
This commit is contained in:
G10h4ck 2018-08-28 19:55:36 +02:00 committed by GitHub
commit 2be556c767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libresapi/src/libresapi.pro
View File

@ -110,7 +110,7 @@ libresapihttpserver {
QMAKE_EXTRA_COMPILERS += create_webfiles_html create_webfiles_js create_webfiles_css QMAKE_EXTRA_COMPILERS += create_webfiles_html create_webfiles_js create_webfiles_css
} }
win32 { appveyor {
DEFINES *= WINDOWS_SYS DEFINES *= WINDOWS_SYS
INCLUDEPATH += . $$INC_DIR INCLUDEPATH += . $$INC_DIR
@ -126,6 +126,19 @@ libresapihttpserver {
system($$MAKE_SRC\\init.bat .) system($$MAKE_SRC\\init.bat .)
} }
win32 {
DEFINES *= WINDOWS_SYS
INCLUDEPATH += . $$INC_DIR
PRO_PATH=$$shell_path($$_PRO_FILE_PWD_)
MAKE_SRC=$$shell_path($$PRO_PATH/webui-src/make-src)
QMAKE_POST_LINK=$$MAKE_SRC/build.sh $$PRO_PATH
# create dummy files
system($$MAKE_SRC/init.sh .)
}
linux { linux {
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG *= libmicrohttpd PKGCONFIG *= libmicrohttpd