Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions ports/imgui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@ 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})
Expand Down Expand Up @@ -120,6 +113,11 @@ if(IMGUI_FREETYPE)
find_package(freetype CONFIG REQUIRED)
target_link_libraries(${PROJECT_NAME} PUBLIC freetype)
target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.cpp)
target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_ENABLE_FREETYPE)
endif()

if(IMGUI_USE_WCHAR32)
target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_USE_WCHAR32)
endif()

list(REMOVE_DUPLICATES BINDINGS_SOURCES)
Expand Down
81 changes: 0 additions & 81 deletions ports/imgui/CONTROL

This file was deleted.

11 changes: 9 additions & 2 deletions ports/imgui/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ if ("docking-experimental" IN_LIST FEATURES)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ocornut/imgui
REF 682249396f02b8c21e5ff333ab4a1969c89387ad
SHA512 95f17c14e0a8f10dfc51fd1b30894f9905433fac8f9a93b6c545a542df5eb20be68f40996080a85cba934107ce19fff91a1df1edad1a1b5a0030e8f626e1985d
REF 239d09804d17997e147f4bcfb451ead04c1d67ff
SHA512 7e93dd8c1a465b8405d32f08aa2be0c1a2bea7762384ba6a16848e10b10f5684f8969b672cec6e994a90fc6a6189519730dd7d15b82ae39b5221278eae23ba61
HEAD_REF docking
)
else()
Expand Down Expand Up @@ -72,6 +72,13 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()

if ("freetype" IN_LIST FEATURES)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_ENABLE_FREETYPE" "#define IMGUI_ENABLE_FREETYPE")
endif()
if ("wchar32" IN_LIST FEATURES)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_USE_WCHAR32" "#define IMGUI_USE_WCHAR32")
endif()

vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets()

Expand Down
105 changes: 105 additions & 0 deletions ports/imgui/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{
"name": "imgui",
"version": "1.81",
"port-version": 2,
"description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.",
"homepage": "https://github.com/ocornut/imgui",
"features": {
"allegro5-binding": {
"description": "Make available Allegro5 binding",
"dependencies": [
"allegro5"
]
},
"docking-experimental": {
"description": "Build with docking support"
},
"dx10-binding": {
"description": "Make available DirectX10 binding"
},
"dx11-binding": {
"description": "Make available DirectX11 binding"
},
"dx12-binding": {
"description": "Make available DirectX12 binding"
},
"dx9-binding": {
"description": "Make available DirectX9 binding"
},
"freetype": {
"description": "Build font atlases using FreeType instead of stb_truetype",
"dependencies": [
"freetype"
]
},
"glfw-binding": {
"description": "Make available GLFW binding",
"dependencies": [
"glfw3"
]
},
"glut-binding": {
"description": "Make available Glut binding",
"dependencies": [
"freeglut"
]
},
"libigl-imgui": {
"description": "Install the libigl-imgui headers"
},
"marmalade-binding": {
"description": "Make available Marmalade binding"
},
"metal-binding": {
"description": "Make available Metal binding"
},
"opengl2-binding": {
"description": "Make available OpenGL (legacy) binding"
},
"opengl3-gl3w-binding": {
"description": "Make available OpenGL3/ES/ES2 (modern) binding with gl3w",
"dependencies": [
"gl3w"
]
},
"opengl3-glad-binding": {
"description": "Make available OpenGL3/ES/ES2 (modern) binding with glad",
"dependencies": [
"glad"
]
},
"opengl3-glbinding-binding": {
"description": "Make available OpenGL3/ES/ES2 (modern) binding glbinding",
"dependencies": [
"glbinding"
]
},
"opengl3-glew-binding": {
"description": "Make available OpenGL3/ES/ES2 (modern) binding with GLEW",
"dependencies": [
"glew"
]
},
"osx-binding": {
"description": "Make available OSX binding"
},
"sdl2-binding": {
"description": "Make available SDL2 binding",
"dependencies": [
"sdl2"
]
},
"vulkan-binding": {
"description": "Make available Vulkan binding",
"dependencies": [
"vulkan"
]
},
"wchar32": {
"description": "Use WCHAR32 instead of WCHAR16"
},
"win32-binding": {
"description": "Make available Win32 binding"
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2530,7 +2530,7 @@
},
"imgui": {
"baseline": "1.81",
"port-version": 1
"port-version": 2
},
"imgui-sfml": {
"baseline": "2.1-2",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/imgui.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "82e2ab3945def5ecc234f9586425f4dc8cb6d15e",
"version": "1.81",
"port-version": 2
},
{
"git-tree": "6f5ea94c84f8e4d7883a613421ef285960ce7482",
"version-string": "1.81",
Expand Down