From 524f16b1dc55fd3b5ecc366bf40bab07b70a8a19 Mon Sep 17 00:00:00 2001 From: Alex Hildebrand Date: Mon, 30 Nov 2020 22:51:09 +0100 Subject: [PATCH 1/7] Submodules for cimguizmo, cimnodes, cimplot and CMake file to generate corresponding libraries --- .gitmodules | 9 +++++++++ CMakeLists.txt | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ cimguizmo | 1 + cimnodes | 1 + cimplot | 1 + 5 files changed, 66 insertions(+) create mode 100644 CMakeLists.txt create mode 160000 cimguizmo create mode 160000 cimnodes create mode 160000 cimplot diff --git a/.gitmodules b/.gitmodules index 11b640e..7b3d0c3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,12 @@ [submodule "cimgui"] path = cimgui url = https://github.com/extrawurst/cimgui +[submodule "cimplot"] + path = cimplot + url = https://github.com/cimgui/cimplot.git +[submodule "cimnodes"] + path = cimnodes + url = https://github.com/cimgui/cimnodes.git +[submodule "cimguizmo"] + path = cimguizmo + url = https://github.com/cimgui/cimguizmo.git diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..5d34310 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,54 @@ +cmake_minimum_required(VERSION 3.1) + +project(cimgui) + + + +add_library(cimgui SHARED + cimgui/cimgui.cpp + cimgui/imgui/imgui.cpp + cimgui/imgui/imgui_draw.cpp + cimgui/imgui/imgui_demo.cpp + cimgui/imgui/imgui_widgets.cpp) + +target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1) + + + +add_library(cimplot SHARED + cimgui/imgui/imgui.cpp + cimgui/imgui/imgui_draw.cpp + cimgui/imgui/imgui_demo.cpp + cimgui/imgui/imgui_widgets.cpp + cimplot/cimplot.cpp + cimplot/implot/implot.cpp + cimplot/implot/implot_demo.cpp + cimplot/implot/implot_items.cpp + cimguizmo/cimguizmo.cpp + cimguizmo/imGuizmo/imGuizmo.cpp) + +target_include_directories(cimplot PUBLIC cimgui/imgui) + + + +add_library(cimnodes SHARED + cimgui/imgui/imgui.cpp + cimgui/imgui/imgui_draw.cpp + cimgui/imgui/imgui_demo.cpp + cimgui/imgui/imgui_widgets.cpp + cimnodes/cimnodes.cpp + cimnodes/imnodes/imnodes.cpp) + +target_include_directories(cimnodes PUBLIC cimgui/imgui) + + + +add_library(cimguizmo SHARED + cimgui/imgui/imgui.cpp + cimgui/imgui/imgui_draw.cpp + cimgui/imgui/imgui_demo.cpp + cimgui/imgui/imgui_widgets.cpp + cimguizmo/cimguizmo.cpp + cimguizmo/imGuizmo/imGuizmo.cpp) + +target_include_directories(cimguizmo PUBLIC cimgui/imgui) \ No newline at end of file diff --git a/cimguizmo b/cimguizmo new file mode 160000 index 0000000..ffb2b8a --- /dev/null +++ b/cimguizmo @@ -0,0 +1 @@ +Subproject commit ffb2b8a9be43cfe85aeff97c96cf42d823a28b26 diff --git a/cimnodes b/cimnodes new file mode 160000 index 0000000..f4d6f87 --- /dev/null +++ b/cimnodes @@ -0,0 +1 @@ +Subproject commit f4d6f8747c76bf156ac681af06944bdafc917ebf diff --git a/cimplot b/cimplot new file mode 160000 index 0000000..a7760f2 --- /dev/null +++ b/cimplot @@ -0,0 +1 @@ +Subproject commit a7760f2f7557e15f50fe7916c9243b192345b38e From 5c3b3096b6bc9704ec23cbf88b9be5a587847120 Mon Sep 17 00:00:00 2001 From: Alex Hildebrand Date: Tue, 1 Dec 2020 21:46:01 +0100 Subject: [PATCH 2/7] Added cimplot, cimnodes and cimguizmo builds to CI --- .travis.yml | 6 +++++- appveyor.yml | 25 ++++++++++++++++++++++--- build-native.cmd | 4 ++-- build-native.sh | 5 ++--- ci-build.cmd | 10 ++++++++-- 5 files changed, 39 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index db5d679..482b5e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,11 @@ deploy: provider: releases api_key: secure: i/+8OvgiHRcQIpv0s+9K+xsKuhmXQWouSoL0jCP2Y6BMnftKYSqhxHsO9N770wIYXSYU0g1Syd03eiBAJ7kVEnGe2FnB4Vz+P3nvBw0RUZV17Vpoyi9X7CHc06botCqqmmXfFGLaY78MHHAYARJjW8pGlZ+htfT+/MM7Tvpoo2GQUnGLN/d9EQVuWA4opdBCsK+MMwQCRAwpLOsZ5skNtZJoYDNJopQBuRTU+SNMR1Wf4On/f59wA+x4fUNpxrP9AFl3M71fWzGnRAKaRrTkHTOufHzzv/cyVihGMFnJY8POGG1fMXJUD6/DWuoUUVr9PV1YKgUPhs4O917Mi+qtykCv9XvVJi9eXMFWuCgIpokbtJXRIqxA4+PlatlthpnSA7tDIJDGRBiguy+JnG0X+KfQD+h+6KKvwO56IRirxbm6bZUEcF4T6g4jmsQo9qkxymAnfKWSiIvZVsUhN4nUcZA5+wQpbKfX17sf72Zl0mMkGB3AKq93rWDvePXw9iYHk3IYL9wZleOtUHshoKgmbSaW2D/whTBaHcI442tpa8HAX2YodN6Aw6rLWu6NccUSi8DT84K8WMf17XJ+lTSaHZ7UFLSHG1MeEi7ayHV83nKO17VrkNz1yRP7KWjDedFUdIjffBaGJPjPoYZGI8FgnXHQ/uKuUvNZidjmBMa/Pa0= - file: cimgui/build/Release/cimgui.dylib + file: + - "build/Release/cimgui.dylib" + - "build/Release/cimplot.dylib" + - "build/Release/cimnodes.dylib" + - "build/Release/cimguizmo.dylib" on: tags: true repo: mellinoe/ImGui.NET-nativebuild diff --git a/appveyor.yml b/appveyor.yml index d3d5bfe..b96f798 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,12 +8,31 @@ build_script: - sh: ./ci-build.sh - cmd: call .\ci-build.cmd artifacts: -- path: cimgui/build/Release/cimgui.so +- path: build/Release/cimgui.so name: cimgui.so -- path: cimgui\build\x64\Release\cimgui.win-x64.dll +- path: build/Release/cimplot.so + name: cimplot.so +- path: build/Release/cimnodes.so + name: cimnodes.so +- path: build/Release/cimguizmo.so + name: cimguizmo.so +- path: build\x64\Release\cimgui.win-x64.dll name: cimgui.win-x64.dll -- path: cimgui\build\x86\Release\cimgui.win-x86.dll +- path: build\x64\Release\cimplot.win-x64.dll + name: cimplot.win-x64.dll +- path: build\x64\Release\cimnodes.win-x64.dll + name: cimnodes.win-x64.dll +- path: build\x64\Release\cimguizmo.win-x64.dll + name: cimguizmo.win-x64.dll +- path: build\x86\Release\cimgui.win-x86.dll name: cimgui.win-x86.dll +- path: build\x86\Release\cimplot.win-x86.dll + name: cimplot.win-x86.dll +- path: build\x86\Release\cimnodes.win-x86.dll + name: cimnodes.win-x86.dll +- path: build\x86\Release\cimguizmo.win-x86.dll + name: cimguizmo.win-x86.dll + deploy: release: $(APPVEYOR_REPO_TAG_NAME) diff --git a/build-native.cmd b/build-native.cmd index a385f47..c6ac694 100644 --- a/build-native.cmd +++ b/build-native.cmd @@ -1,7 +1,7 @@ @setlocal @echo off -set CIMGUI_ROOT=%~dp0cimgui +set SCRIPT_PATH=%~dp0 set BUILD_CONFIG=Debug set BUILD_ARCH=x64 set BUILD_CMAKE_GENERATOR_PLATFORM=x64 @@ -16,7 +16,7 @@ shift goto ArgLoop :Build -pushd %CIMGUI_ROOT% +pushd %SCRIPT_PATH% If NOT exist ".\build\%BUILD_ARCH%" ( mkdir build\%BUILD_ARCH% diff --git a/build-native.sh b/build-native.sh index bcfca9a..928496b 100755 --- a/build-native.sh +++ b/build-native.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash scriptPath="`dirname \"$0\"`" -cimguiPath=$scriptPath/cimgui _CMakeBuildType=Debug @@ -25,8 +24,8 @@ while :; do shift done -mkdir -p $cimguiPath/build/$_CMakeBuildType -pushd $cimguiPath/build/$_CMakeBuildType +mkdir -p $scriptPath/build/$_CMakeBuildType +pushd $scriptPath/build/$_CMakeBuildType cmake ../.. -DCMAKE_BUILD_TYPE=$_CMakeBuildType make popd diff --git a/ci-build.cmd b/ci-build.cmd index 45f3c7c..643f7fa 100644 --- a/ci-build.cmd +++ b/ci-build.cmd @@ -2,6 +2,12 @@ @echo off call %~dp0build-native.cmd Release x64 -copy %~dp0cimgui\build\x64\Release\cimgui.dll %~dp0cimgui\build\x64\Release\cimgui.win-x64.dll +copy %~dp0build\x64\Release\cimgui.dll %~dp0build\x64\Release\cimgui.win-x64.dll +copy %~dp0build\x64\Release\cimplot.dll %~dp0build\x64\Release\cimplot.win-x64.dll +copy %~dp0build\x64\Release\cimnodes.dll %~dp0build\x64\Release\cimnodes.win-x64.dll +copy %~dp0build\x64\Release\cimguizmo.dll %~dp0build\x64\Release\cimguizmo.win-x64.dll call %~dp0build-native.cmd Release x86 -copy %~dp0cimgui\build\x86\Release\cimgui.dll %~dp0cimgui\build\x86\Release\cimgui.win-x86.dll +copy %~dp0build\x86\Release\cimgui.dll %~dp0build\x86\Release\cimgui.win-x86.dll +copy %~dp0build\x86\Release\cimplot.dll %~dp0build\x86\Release\cimplot.win-x86.dll +copy %~dp0build\x86\Release\cimnodes.dll %~dp0build\x86\Release\cimnodes.win-x86.dll +copy %~dp0build\x86\Release\cimguizmo.dll %~dp0build\x86\Release\cimguizmo.win-x86.dll From ec8ce6324201ea20666291ce7d184baaa5ad1a21 Mon Sep 17 00:00:00 2001 From: Alex Hildebrand Date: Tue, 1 Dec 2020 22:19:36 +0100 Subject: [PATCH 3/7] Fixed source paths for linux build --- CMakeLists.txt | 52 ++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d34310..4d418b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,45 +10,43 @@ add_library(cimgui SHARED cimgui/imgui/imgui_draw.cpp cimgui/imgui/imgui_demo.cpp cimgui/imgui/imgui_widgets.cpp) - + target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1) - - - -add_library(cimplot SHARED - cimgui/imgui/imgui.cpp - cimgui/imgui/imgui_draw.cpp - cimgui/imgui/imgui_demo.cpp - cimgui/imgui/imgui_widgets.cpp + + + +add_library(cimplot SHARED + cimgui/imgui/imgui.cpp + cimgui/imgui/imgui_draw.cpp + cimgui/imgui/imgui_demo.cpp + cimgui/imgui/imgui_widgets.cpp cimplot/cimplot.cpp cimplot/implot/implot.cpp cimplot/implot/implot_demo.cpp - cimplot/implot/implot_items.cpp - cimguizmo/cimguizmo.cpp - cimguizmo/imGuizmo/imGuizmo.cpp) - + cimplot/implot/implot_items.cpp) + target_include_directories(cimplot PUBLIC cimgui/imgui) -add_library(cimnodes SHARED - cimgui/imgui/imgui.cpp - cimgui/imgui/imgui_draw.cpp - cimgui/imgui/imgui_demo.cpp - cimgui/imgui/imgui_widgets.cpp +add_library(cimnodes SHARED + cimgui/imgui/imgui.cpp + cimgui/imgui/imgui_draw.cpp + cimgui/imgui/imgui_demo.cpp + cimgui/imgui/imgui_widgets.cpp cimnodes/cimnodes.cpp cimnodes/imnodes/imnodes.cpp) - + target_include_directories(cimnodes PUBLIC cimgui/imgui) -add_library(cimguizmo SHARED - cimgui/imgui/imgui.cpp - cimgui/imgui/imgui_draw.cpp - cimgui/imgui/imgui_demo.cpp - cimgui/imgui/imgui_widgets.cpp +add_library(cimguizmo SHARED + cimgui/imgui/imgui.cpp + cimgui/imgui/imgui_draw.cpp + cimgui/imgui/imgui_demo.cpp + cimgui/imgui/imgui_widgets.cpp cimguizmo/cimguizmo.cpp - cimguizmo/imGuizmo/imGuizmo.cpp) - -target_include_directories(cimguizmo PUBLIC cimgui/imgui) \ No newline at end of file + cimguizmo/ImGuizmo/ImGuizmo.cpp) + +target_include_directories(cimguizmo PUBLIC cimgui/imgui) From 07a650a4717f57fecaf395358cdce7311f3a59c7 Mon Sep 17 00:00:00 2001 From: Alex Hildebrand Date: Tue, 1 Dec 2020 22:26:23 +0100 Subject: [PATCH 4/7] Removed lib prefix for linux library names --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d418b0..9ce2388 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ add_library(cimgui SHARED cimgui/imgui/imgui_widgets.cpp) target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1) - +set_target_properties(cimgui PROPERTIES PREFIX "") add_library(cimplot SHARED @@ -26,7 +26,7 @@ add_library(cimplot SHARED cimplot/implot/implot_items.cpp) target_include_directories(cimplot PUBLIC cimgui/imgui) - +set_target_properties(cimplot PROPERTIES PREFIX "") add_library(cimnodes SHARED @@ -38,7 +38,7 @@ add_library(cimnodes SHARED cimnodes/imnodes/imnodes.cpp) target_include_directories(cimnodes PUBLIC cimgui/imgui) - +set_target_properties(cimnodes PROPERTIES PREFIX "") add_library(cimguizmo SHARED @@ -50,3 +50,4 @@ add_library(cimguizmo SHARED cimguizmo/ImGuizmo/ImGuizmo.cpp) target_include_directories(cimguizmo PUBLIC cimgui/imgui) +set_target_properties(cimguizmo PROPERTIES PREFIX "") \ No newline at end of file From 5396f5fceae832edd9851cfd4f84ac49ec0653bc Mon Sep 17 00:00:00 2001 From: Alex Hildebrand Date: Tue, 1 Dec 2020 22:38:48 +0100 Subject: [PATCH 5/7] Require C++11 for ImGuizmo MacOS build --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ce2388..bd3a259 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.1) project(cimgui) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED True) add_library(cimgui SHARED From ff55f126307194c45fa334dd6152344a1e39ff0b Mon Sep 17 00:00:00 2001 From: Alex Hildebrand Date: Wed, 17 Mar 2021 23:03:40 +0100 Subject: [PATCH 6/7] Updated cimgui, cimplot, cimnodes and cimguizmo --- CMakeLists.txt | 6 +++++- cimgui | 2 +- cimguizmo | 2 +- cimnodes | 2 +- cimplot | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd3a259..c4e1e2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,8 @@ add_library(cimgui SHARED cimgui/imgui/imgui.cpp cimgui/imgui/imgui_draw.cpp cimgui/imgui/imgui_demo.cpp - cimgui/imgui/imgui_widgets.cpp) + cimgui/imgui/imgui_widgets.cpp + cimgui/imgui/imgui_tables.cpp) target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1) set_target_properties(cimgui PROPERTIES PREFIX "") @@ -22,6 +23,7 @@ add_library(cimplot SHARED cimgui/imgui/imgui_draw.cpp cimgui/imgui/imgui_demo.cpp cimgui/imgui/imgui_widgets.cpp + cimgui/imgui/imgui_tables.cpp cimplot/cimplot.cpp cimplot/implot/implot.cpp cimplot/implot/implot_demo.cpp @@ -36,6 +38,7 @@ add_library(cimnodes SHARED cimgui/imgui/imgui_draw.cpp cimgui/imgui/imgui_demo.cpp cimgui/imgui/imgui_widgets.cpp + cimgui/imgui/imgui_tables.cpp cimnodes/cimnodes.cpp cimnodes/imnodes/imnodes.cpp) @@ -48,6 +51,7 @@ add_library(cimguizmo SHARED cimgui/imgui/imgui_draw.cpp cimgui/imgui/imgui_demo.cpp cimgui/imgui/imgui_widgets.cpp + cimgui/imgui/imgui_tables.cpp cimguizmo/cimguizmo.cpp cimguizmo/ImGuizmo/ImGuizmo.cpp) diff --git a/cimgui b/cimgui index 9cb4b4f..83f729b 160000 --- a/cimgui +++ b/cimgui @@ -1 +1 @@ -Subproject commit 9cb4b4f63cd41508db8b43ad10f131013669ed7d +Subproject commit 83f729b09313749a56948604c4bc13492ac47e00 diff --git a/cimguizmo b/cimguizmo index ffb2b8a..fcf76e3 160000 --- a/cimguizmo +++ b/cimguizmo @@ -1 +1 @@ -Subproject commit ffb2b8a9be43cfe85aeff97c96cf42d823a28b26 +Subproject commit fcf76e389ef7e88bcf05340b14d031e1111caf32 diff --git a/cimnodes b/cimnodes index f4d6f87..e7d42e5 160000 --- a/cimnodes +++ b/cimnodes @@ -1 +1 @@ -Subproject commit f4d6f8747c76bf156ac681af06944bdafc917ebf +Subproject commit e7d42e5e8bcd8b7307a8faf6961d64296d3c9408 diff --git a/cimplot b/cimplot index a7760f2..43e4683 160000 --- a/cimplot +++ b/cimplot @@ -1 +1 @@ -Subproject commit a7760f2f7557e15f50fe7916c9243b192345b38e +Subproject commit 43e46831c58c85a16bff1f460121baae2bf7f96c From fe1263bff94901f2e7ea182b1dc33d5e7ccc20bc Mon Sep 17 00:00:00 2001 From: Alex Hildebrand Date: Fri, 19 Mar 2021 20:17:43 +0100 Subject: [PATCH 7/7] Switched cimgui back to docking_inter branch --- cimgui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cimgui b/cimgui index 83f729b..ccdae84 160000 --- a/cimgui +++ b/cimgui @@ -1 +1 @@ -Subproject commit 83f729b09313749a56948604c4bc13492ac47e00 +Subproject commit ccdae842e40f35ebf40167918175deb9af8c2a16