From 93c3971c941f4bb306cefd55c036c1525d41ad9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Wed, 28 Jun 2023 00:59:16 -0300 Subject: [PATCH] Fix emscripten and macOS builds. --- src/eepp/window/backend/SDL2/windowsdl2.cpp | 2 ++ src/tools/ecode/ecode.cpp | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/eepp/window/backend/SDL2/windowsdl2.cpp b/src/eepp/window/backend/SDL2/windowsdl2.cpp index 28aa08990..9cda3d2fa 100644 --- a/src/eepp/window/backend/SDL2/windowsdl2.cpp +++ b/src/eepp/window/backend/SDL2/windowsdl2.cpp @@ -786,12 +786,14 @@ void WindowSDL::raise() { } void WindowSDL::flash( WindowFlashOperation op ) { +#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN SDL_FlashOperation sdlOp = SDL_FlashOperation::SDL_FLASH_BRIEFLY; if ( op == WindowFlashOperation::Cancel ) sdlOp = SDL_FlashOperation::SDL_FLASH_CANCEL; else if ( op == WindowFlashOperation::UntilFocused ) sdlOp = SDL_FlashOperation::SDL_FLASH_UNTIL_FOCUSED; SDL_FlashWindow( mSDLWindow, sdlOp ); +#endif } void WindowSDL::show() { diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp index 09edebcc8..7426cb8eb 100644 --- a/src/tools/ecode/ecode.cpp +++ b/src/tools/ecode/ecode.cpp @@ -12,8 +12,14 @@ #include #include #include -#include #include +#if EE_PLATFORM == EE_PLATFORM_LINUX +// For malloc_trim, which is a GNU extension +extern "C" { +#include +} +#endif + namespace fs = std::filesystem; using json = nlohmann::json;