diff options
| -rw-r--r-- | scripts/cmake/cairo.cmake | 6 | ||||
| -rw-r--r-- | scripts/meson-emscripten.ini.in | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/scripts/cmake/cairo.cmake b/scripts/cmake/cairo.cmake index d1a775e3..64de7318 100644 --- a/scripts/cmake/cairo.cmake +++ b/scripts/cmake/cairo.cmake @@ -4,10 +4,10 @@ find_program(NINJA ninja REQUIRED) set(CAIRO_BUILD_DIR ${CMAKE_BINARY_DIR}/cairo/build) set(CAIRO_INSTALL_DIR ${CMAKE_BINARY_DIR}/cairo/install) -set(CAIRO_MESON_SETUP meson setup ${CAIRO_BUILD_DIR} --prefix=${CAIRO_INSTALL_DIR} --reconfigure) +set(CAIRO_MESON_SETUP meson setup ${CAIRO_BUILD_DIR} --prefix=${CAIRO_INSTALL_DIR}) if(EMSCRIPTEN) - FILE(REAL_PATH ${CMAKE_C_COMPILER}/.. EMSCRIPTEN_TOOLCHAIN) + cmake_path(GET CMAKE_C_COMPILER PARENT_PATH EMSCRIPTEN_TOOLCHAIN) set(EMSCRIPTEN_CROSS_FILE_TEMPLATE ${PROJECT_SOURCE_DIR}/scripts/meson-emscripten.ini.in) set(EMSCRIPTEN_CROSS_FILE ${CAIRO_BUILD_DIR}/emscripten.ini) configure_file(${EMSCRIPTEN_CROSS_FILE_TEMPLATE} ${EMSCRIPTEN_CROSS_FILE}) @@ -15,7 +15,7 @@ if(EMSCRIPTEN) endif() add_custom_target( - cairo + cairo-build COMMAND mkdir -p ${CAIRO_BUILD_DIR} ${CAIRO_INSTALL_DIR} COMMAND ${CAIRO_MESON_SETUP} COMMAND ninja -C ${CAIRO_BUILD_DIR} diff --git a/scripts/meson-emscripten.ini.in b/scripts/meson-emscripten.ini.in index 85e1663e..fc88ce32 100644 --- a/scripts/meson-emscripten.ini.in +++ b/scripts/meson-emscripten.ini.in @@ -1,5 +1,6 @@ [constants] emscripten = '${EMSCRIPTEN_TOOLCHAIN}' +emscripten_flags = ['-W', '-Wno-unused-parameter', '-matomics', '-mbulk-memory'] [binaries] c = emscripten / 'emcc' @@ -8,11 +9,13 @@ c_ld = emscripten / 'emcc' cpp_ld = emscripten / 'emcc' ar = emscripten / 'emar' nm = emscripten / 'emnm' -ranlid =emscripten / 'emranlib' +ranlid = emscripten / 'emranlib' strip = emscripten / 'emstrip' [built-in options] default_library = 'static' +c_args = emscripten_flags +cpp_args = emscripten_flags [pixman:project options] loongson-mmi = 'disabled' @@ -25,6 +28,4 @@ neon = 'disabled' a64-neon = 'disabled' iwmmxt = 'disabled' mips-dspr2 = 'disabled' -tests = 'disabled' -demos = 'disabled' |