diff options
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/Jamfile.jam | 42 | ||||
| m--------- | thirdparty/glad | 0 | ||||
| m--------- | thirdparty/imgui | 0 | ||||
| m--------- | thirdparty/lunasvg | 0 | ||||
| -rw-r--r-- | thirdparty/openmesh/helpers.h | 22 |
5 files changed, 46 insertions, 18 deletions
diff --git a/thirdparty/Jamfile.jam b/thirdparty/Jamfile.jam index b6ed163..468e6a0 100644 --- a/thirdparty/Jamfile.jam +++ b/thirdparty/Jamfile.jam @@ -1,30 +1,36 @@ -import glad ; -lib glad : gl.xml : +project ilt.thirdparty : requirements <link>static <cflags>-fPIC <warnings>off <warnings-as-errors>off - <glad.version>3.3 ; -lib stb : stb_image.c : - <link>static - <cflags>-fPIC - <warnings>off - <warnings-as-errors>off + +import glad ; +lib glad : gl.xml : + <glad.version>4.6 ; +lib stb : stb_image.c ; + +path-constant imgui : imgui ; lib imguisdl2 : - [ glob imgui/imgui*.cpp imgui/misc/cpp/*.cpp : imgui/imgui_demo.cpp ] - imgui/backends/imgui_impl_sdl2.cpp - imgui/backends/imgui_impl_opengl3.cpp + [ glob $(imgui)/imgui*.cpp $(imgui)/misc/cpp/*.cpp : $(imgui)/imgui_demo.cpp ] + $(imgui)/backends/imgui_impl_sdl2.cpp + $(imgui)/backends/imgui_impl_opengl3.cpp : - <link>static - <include>imgui - <include>imgui/misc/cpp + <include>$(imgui) + <include>$(imgui)/misc/cpp <use>..//sdl2 - <cflags>-fPIC - <warnings>off - <warnings-as-errors>off : : - <include>imgui + <cflags>-isystem\ $(imgui) + ; + +path-constant lunasvg : lunasvg ; +lib lunasvg : + [ glob $(lunasvg)/source/*.cpp $(lunasvg)/plutovg/source/*.c ] + : + <include>$(lunasvg)/include + <include>$(lunasvg)/plutovg/include + : : + <cflags>-isystem\ $(lunasvg)/include ; diff --git a/thirdparty/glad b/thirdparty/glad -Subproject 2348b07c1ab4504d60398713781d8a57880234f +Subproject 73db193f853e2ee079bf3ca8a64aa2eaf645904 diff --git a/thirdparty/imgui b/thirdparty/imgui -Subproject 2db79d0868f7b02d26f7557a72504a0b6f84493 +Subproject b4c96355c9b51b54c4deb52e7d7cdfc7bf79bc2 diff --git a/thirdparty/lunasvg b/thirdparty/lunasvg new file mode 160000 +Subproject f8aabfb444bb37f69df7290790f57e4a27730a9 diff --git a/thirdparty/openmesh/helpers.h b/thirdparty/openmesh/helpers.h index a0105c8..0e29261 100644 --- a/thirdparty/openmesh/helpers.h +++ b/thirdparty/openmesh/helpers.h @@ -7,6 +7,7 @@ namespace OpenMesh { template<typename Iter, typename... IterParams> using IteratorFunction = Iter (OpenMesh::PolyConnectivity::*)(IterParams...) const; +#if OM_GET_VER < 8 template<typename Iter, typename CenterEntityHandle, IteratorFunction<Iter, CenterEntityHandle> BeginFunc, IteratorFunction<Iter, CenterEntityHandle> EndFunc, typename Adaptor> auto @@ -26,6 +27,27 @@ namespace OpenMesh { { return std::views::iota(range.begin(), range.end()) | std::forward<Adaptor>(adaptor); } +#else + template<typename Iter, typename CenterEntityHandle, typename ToEntityHandle, + IteratorFunction<Iter, CenterEntityHandle> BeginFunc, IteratorFunction<Iter, CenterEntityHandle> EndFunc, + typename Adaptor> + auto + operator|(const CirculatorRange<CirculatorRangeTraitT<OpenMesh::PolyConnectivity, Iter, CenterEntityHandle, + ToEntityHandle, BeginFunc, EndFunc>> & range, + Adaptor && adaptor) + { + return std::views::iota(range.begin(), range.end()) | std::forward<Adaptor>(adaptor); + } + + template<typename Iter, IteratorFunction<Iter> BeginFunc, IteratorFunction<Iter> EndFunc, typename Adaptor> + auto + operator|(const EntityRange<RangeTraitT<const OpenMesh::PolyConnectivity, Iter, BeginFunc, EndFunc>> & range, + Adaptor && adaptor) + { + return std::views::iota(range.begin(), range.end()) | std::forward<Adaptor>(adaptor); + } + +#endif namespace Helpers { template<typename Type, template<typename> typename PropertyT> struct Property : public PropertyT<Type> { |