build: Fix emscripten build
This commit is contained in:
parent
8b3c297514
commit
ffbf409174
@ -2,6 +2,7 @@
|
||||
|
||||
#include <imgui.h>
|
||||
#include <imgui_internal.h>
|
||||
#define IMGL3W_IMPL
|
||||
#include <imgui_impl_opengl3_loader.h>
|
||||
#undef IMGUI_DEFINE_MATH_OPERATORS
|
||||
|
||||
|
@ -32,9 +32,9 @@
|
||||
#ifndef __gl3w_h_
|
||||
#define __gl3w_h_
|
||||
|
||||
#ifdef __APPLE__
|
||||
#if defined(__APPLE__)
|
||||
#include <OpenGL/gl.h>
|
||||
#else
|
||||
#elif !defined(__EMSCRIPTEN__)
|
||||
#include <GL/gl.h>
|
||||
#endif
|
||||
|
||||
|
3
lib/third_party/imgui/imgui/CMakeLists.txt
vendored
3
lib/third_party/imgui/imgui/CMakeLists.txt
vendored
@ -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})
|
Loading…
x
Reference in New Issue
Block a user