From 59fa32e96a8e24d439afc1bcba503e87852a4644 Mon Sep 17 00:00:00 2001 From: Tadej Novak Date: Tue, 15 Mar 2022 13:22:11 +0100 Subject: [PATCH] [qt] Build with WebAssembly (#256) --- platform/default/src/mbgl/storage/mbtiles_file_source.cpp | 2 +- platform/default/src/mbgl/util/compression.cpp | 2 +- platform/qt/qt.cmake | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/platform/default/src/mbgl/storage/mbtiles_file_source.cpp b/platform/default/src/mbgl/storage/mbtiles_file_source.cpp index b89014af8..dc2b60876 100644 --- a/platform/default/src/mbgl/storage/mbtiles_file_source.cpp +++ b/platform/default/src/mbgl/storage/mbtiles_file_source.cpp @@ -17,7 +17,7 @@ #include -#if defined(__QT__) && defined(_WIN32) +#if defined(__QT__) && (defined(_WIN32) || defined(__EMSCRIPTEN__)) #include #else #include diff --git a/platform/default/src/mbgl/util/compression.cpp b/platform/default/src/mbgl/util/compression.cpp index a6b5b4acf..10513e9d1 100644 --- a/platform/default/src/mbgl/util/compression.cpp +++ b/platform/default/src/mbgl/util/compression.cpp @@ -1,6 +1,6 @@ #include -#if defined(__QT__) && defined(_WIN32) +#if defined(__QT__) && (defined(_WIN32) || defined(__EMSCRIPTEN__)) #include #else #include diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index cb11d5352..06548632b 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -150,7 +150,7 @@ set_property(TARGET mbgl-core PROPERTY AUTOMOC ON) target_link_libraries( mbgl-core PRIVATE - $<$>:z> + $<$>:z> Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Network @@ -294,6 +294,10 @@ if(NOT MBGL_QT_LIBRARY_ONLY) ${PROJECT_SOURCE_DIR}/platform/qt/resources/common.qrc ) + if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") + set(CMAKE_EXECUTABLE_SUFFIX ".html") + endif() + # Qt public API should keep compatibility with old compilers for legacy systems set_property(TARGET mbgl-qt PROPERTY CXX_STANDARD 98) set_property(TARGET mbgl-qt PROPERTY AUTOMOC ON)