mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Merge pull request #1318 from zapek/msys2_build_fix
fixed webui files generation under MSYS2
This commit is contained in:
commit
2be556c767
@ -110,7 +110,7 @@ libresapihttpserver {
|
||||
QMAKE_EXTRA_COMPILERS += create_webfiles_html create_webfiles_js create_webfiles_css
|
||||
}
|
||||
|
||||
win32 {
|
||||
appveyor {
|
||||
DEFINES *= WINDOWS_SYS
|
||||
INCLUDEPATH += . $$INC_DIR
|
||||
|
||||
@ -126,6 +126,19 @@ libresapihttpserver {
|
||||
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 {
|
||||
CONFIG += link_pkgconfig
|
||||
PKGCONFIG *= libmicrohttpd
|
||||
|
Loading…
Reference in New Issue
Block a user