From 2848359f77efc70c57fb8c56be8f2e34ad3198bf Mon Sep 17 00:00:00 2001 From: zapek Date: Fri, 3 Aug 2018 20:09:32 +0200 Subject: [PATCH] fixed webui files generation under MSYS2 --- libresapi/src/libresapi.pro | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libresapi/src/libresapi.pro b/libresapi/src/libresapi.pro index b07846411..873320c51 100644 --- a/libresapi/src/libresapi.pro +++ b/libresapi/src/libresapi.pro @@ -110,7 +110,7 @@ libresapihttpserver { QMAKE_EXTRA_COMPILERS += create_webfiles_html create_webfiles_js create_webfiles_css } - win32 { + win32-x { 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