diff options
| author | Ian Reinhart Geiser <geiseri@geekcentral.pub> | 2020-09-05 01:22:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 22:22:28 -0700 |
| commit | 00d27cfd04e151603ebfe96b511d9bce2779c029 (patch) | |
| tree | 876d39784aa7017cea96e61f120e6258832cb31a | |
| parent | 1a9ecfc894e84d2e2104ad13b170b15e3289d8cb (diff) | |
| download | vcpkg-00d27cfd04e151603ebfe96b511d9bce2779c029.tar.gz vcpkg-00d27cfd04e151603ebfe96b511d9bce2779c029.zip | |
Add option for WCHAR32 support in ImGUI (#13285)
| -rw-r--r-- | ports/imgui/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | ports/imgui/CONTROL | 5 | ||||
| -rw-r--r-- | ports/imgui/portfile.cmake | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index 795ce24a7..e8d57c21c 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -22,6 +22,13 @@ target_sources( ${CMAKE_CURRENT_SOURCE_DIR}/misc/cpp/imgui_stdlib.cpp ) + +if(IMGUI_USE_WCHAR32) + FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/imconfig.h IMCONFIG) + STRING(REGEX REPLACE "//#define IMGUI_USE_WCHAR32" "#define IMGUI_USE_WCHAR32" IMCONFIG "${IMCONFIG}") + FILE(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/imconfig.h "${IMCONFIG}") +endif() + if(IMGUI_BUILD_ALLEGRO5_BINDING) find_path(ALLEGRO5_INCLUDE_DIRS allegro5/allegro.h) target_include_directories(${PROJECT_NAME} PRIVATE ${ALLEGRO5_INCLUDE_DIRS}) @@ -172,7 +179,7 @@ if(NOT IMGUI_SKIP_HEADERS) file(GLOB MARMALADE_BINDING_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_marmalade.*) install(FILES ${MARMALADE_BINDING_SRCS} DESTINATION include/bindings) endif() - + if(IMGUI_BUILD_METAL_BINDING) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples/imgui_impl_metal.h DESTINATION include) endif() diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL index bee67cc00..df074e58f 100644 --- a/ports/imgui/CONTROL +++ b/ports/imgui/CONTROL @@ -1,6 +1,6 @@ Source: imgui Version: 1.78 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/ocornut/imgui Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies. @@ -73,3 +73,6 @@ Build-Depends: freetype Feature: libigl-imgui Description: Install the libigl-imgui headers + +Feature: wchar32 +Description: Use WCHAR32 instead of WCHAR16 diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 1da67c911..bb8ee6e64 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -34,6 +34,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vulkan-binding IMGUI_BUILD_VULKAN_BINDING win32-binding IMGUI_BUILD_WIN32_BINDING freetype IMGUI_FREETYPE + wchar32 IMGUI_USE_WCHAR32 ) if ("libigl-imgui" IN_LIST FEATURES) |