lili/ggwave
1
0
Fork 0
mirror of https://github.com/ggerganov/ggwave.git synced 2026-02-25 00:45:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

examples : refactor common code

Browse Source
This commit is contained in:
Georgi Gerganov
2020-11-29 18:21:57 +02:00
parent fb02177c96
commit 88e9ed79f0
7 changed files with 123 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/third-party/CMakeLists.txt vendored
View File

@@ -1,4 +1,4 @@
if (NOT EMSCRIPTEN)
add_subdirectory(imtui)
add_subdirectory(imgui)
endif()
add_subdirectory(imtui)
add_subdirectory(imgui)

71
examples/third-party/imgui/CMakeLists.txt vendored
View File

@@ -12,7 +12,7 @@ else (APPLE)
unset(ADDITIONAL_LIBRARIES)
endif (APPLE)
add_library(imgui SHARED
add_library(imgui ${GGWAVE_LIBRARY_TYPE}
imgui/imgui.cpp
imgui/imgui_draw.cpp
imgui/imgui_demo.cpp
@@ -32,36 +32,51 @@ target_link_libraries(imgui PRIVATE
)
if (GGWAVE_SUPPORT_SDL2)
find_package(OpenGL REQUIRED)
find_package(SDL2 REQUIRED)
string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
if (NOT EMSCRIPTEN)
find_package(OpenGL REQUIRED)
add_library(imgui-sdl2 SHARED
imgui/examples/libs/gl3w/GL/gl3w.c
imgui-extra/imgui_impl.cpp
imgui-extra/imgui_impl_sdl.cpp
imgui-extra/imgui_impl_opengl3.cpp
)
add_library(imgui-sdl2 ${GGWAVE_LIBRARY_TYPE}
imgui/examples/libs/gl3w/GL/gl3w.c
imgui-extra/imgui_impl.cpp
imgui-extra/imgui_impl_sdl.cpp
imgui-extra/imgui_impl_opengl3.cpp
)
target_include_directories(imgui-sdl2 PUBLIC
imgui/examples/libs/gl3w
${SDL2_INCLUDE_DIRS}
)
target_include_directories(imgui-sdl2 PUBLIC
imgui/examples/libs/gl3w
${SDL2_INCLUDE_DIRS}
)
target_include_directories(imgui-sdl2 PRIVATE
imgui
imgui-extra
)
target_include_directories(imgui-sdl2 PRIVATE
imgui
imgui-extra
)
target_link_libraries(imgui-sdl2 PUBLIC
imgui
${OPENGL_LIBRARIES}
${SDL2_LIBRARIES}
)
target_link_libraries(imgui-sdl2 PUBLIC
imgui
${OPENGL_LIBRARIES}
${SDL2_LIBRARIES}
)
target_link_libraries(imgui-sdl2 PRIVATE
${CMAKE_DL_LIBS}
${CMAKE_THREAD_LIBS_INIT}
${ADDITIONAL_LIBRARIES}
)
target_link_libraries(imgui-sdl2 PRIVATE
${CMAKE_DL_LIBS}
${CMAKE_THREAD_LIBS_INIT}
${ADDITIONAL_LIBRARIES}
)
else()
add_library(imgui-sdl2 ${GGWAVE_LIBRARY_TYPE}
imgui-extra/imgui_impl.cpp
imgui-extra/imgui_impl_sdl.cpp
imgui-extra/imgui_impl_opengl3.cpp
)
target_include_directories(imgui-sdl2 PRIVATE
imgui
imgui-extra
)
target_link_libraries(imgui-sdl2 PUBLIC
imgui
)
endif()
endif()

2
examples/third-party/imgui/imgui-extra/imgui_impl.cpp vendored
View File

@@ -15,6 +15,8 @@
#include <SDL.h>
#include <cstdio>
ImGuiContext* ImGui_Init(SDL_Window* window, SDL_GLContext gl_context) {
// Decide GL+GLSL versions
#if __APPLE__