From ffbf4091748390caddbfb303b153c50e460976a4 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Mon, 20 Nov 2023 22:15:16 +0100 Subject: [PATCH] build: Fix emscripten build --- lib/libimhex/source/ui/imgui_imhex_extensions.cpp | 1 + .../imgui/custom/include/imgui_impl_opengl3_loader.h | 4 ++-- lib/third_party/imgui/imgui/CMakeLists.txt | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libimhex/source/ui/imgui_imhex_extensions.cpp b/lib/libimhex/source/ui/imgui_imhex_extensions.cpp index ac16cbd20..1547ca979 100644 --- a/lib/libimhex/source/ui/imgui_imhex_extensions.cpp +++ b/lib/libimhex/source/ui/imgui_imhex_extensions.cpp @@ -2,6 +2,7 @@ #include #include +#define IMGL3W_IMPL #include #undef IMGUI_DEFINE_MATH_OPERATORS diff --git a/lib/third_party/imgui/custom/include/imgui_impl_opengl3_loader.h b/lib/third_party/imgui/custom/include/imgui_impl_opengl3_loader.h index 6b2e31f9d..fc8ef19b8 100644 --- a/lib/third_party/imgui/custom/include/imgui_impl_opengl3_loader.h +++ b/lib/third_party/imgui/custom/include/imgui_impl_opengl3_loader.h @@ -32,9 +32,9 @@ #ifndef __gl3w_h_ #define __gl3w_h_ -#ifdef __APPLE__ +#if defined(__APPLE__) #include -#else +#elif !defined(__EMSCRIPTEN__) #include #endif diff --git a/lib/third_party/imgui/imgui/CMakeLists.txt b/lib/third_party/imgui/imgui/CMakeLists.txt index e44e14483..4e4380193 100644 --- a/lib/third_party/imgui/imgui/CMakeLists.txt +++ b/lib/third_party/imgui/imgui/CMakeLists.txt @@ -22,12 +22,11 @@ target_include_directories(imgui_imgui PUBLIC add_library(imgui_includes INTERFACE) target_include_directories(imgui_includes INTERFACE include) -target_compile_definitions(imgui_imgui PUBLIC IMGUI_IMPL_OPENGL_LOADER_GLAD) target_compile_options(imgui_imgui PRIVATE -Wno-unknown-warning-option) set_property(TARGET imgui_imgui PROPERTY POSITION_INDEPENDENT_CODE ON) find_package(Freetype REQUIRED) -target_include_directories(imgui_imgui PUBLIC ${FREETYPE_INCLUDE_DIRS} ) +target_include_directories(imgui_imgui PUBLIC ${FREETYPE_INCLUDE_DIRS}) target_link_directories(imgui_imgui PUBLIC ${FREETYPE_LIBRARY_DIRS}) target_link_libraries(imgui_imgui PUBLIC ${FREETYPE_LIBRARIES}) \ No newline at end of file