summaryrefslogtreecommitdiffhomepage
path: root/external
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-08-23 18:54:45 +0200
committerStanislaw Halik <sthalik@misaki.pl>2023-08-23 19:24:39 +0200
commitd5c8c9ba44d0225a942ae70006dc40e8cd22c244 (patch)
tree0577e69e071aef5660993264df8c2648d16bdf1d /external
parentf5308a69ecb6404b02ca8cae1a49711dfceb2c33 (diff)
wip
Diffstat (limited to 'external')
-rw-r--r--external/CMakeLists.txt8
m---------external/imgui0
2 files changed, 4 insertions, 4 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 024c2c4e..d4927955 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -117,14 +117,14 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES)
MAGNUM_WITH_SHADERS ON
MAGNUM_WITH_SHADERTOOLS ON
- MAGNUM_WITH_ANYIMAGECONVERTER OFF
+ MAGNUM_WITH_ANYIMAGECONVERTER ON
MAGNUM_WITH_ANYSCENECONVERTER OFF
MAGNUM_WITH_ANYSHADERCONVERTER OFF
MAGNUM_WITH_BASISIMAGECONVERTER OFF
MAGNUM_WITH_DISTANCEFIELDCONVERTER OFF
MAGNUM_WITH_GLSLANGSHADERCONVERTER OFF
MAGNUM_WITH_GLTFSCENECONVERTER OFF
- MAGNUM_WITH_IMAGECONVERTER OFF
+ MAGNUM_WITH_IMAGECONVERTER ON
MAGNUM_WITH_JPEGIMAGECONVERTER OFF
MAGNUM_WITH_KTXIMAGECONVERTER OFF
MAGNUM_WITH_MESHOPTIMIZERSCENECONVERTER OFF
@@ -135,7 +135,7 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES)
MAGNUM_WITH_SPIRVTOOLSSHADERCONVERTER OFF
MAGNUM_WITH_STANFORDSCENECONVERTER OFF
MAGNUM_WITH_STBRESIZEIMAGECONVERTER ON
- MAGNUM_WITH_TGAIMAGECONVERTER OFF
+ MAGNUM_WITH_TGAIMAGECONVERTER ON
MAGNUM_WITH_MAGNUMFONTCONVERTER ON
MAGNUM_WITH_SHADERCONVERTER ON
@@ -295,7 +295,7 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES)
endif()
if(fm-external-configured)
- set(fm-quiet-message 1)
+ #set(fm-quiet-message 1)
endif()
find_package(SDL2 QUIET REQUIRED)
find_package(Corrade QUIET REQUIRED)
diff --git a/external/imgui b/external/imgui
-Subproject 1e17d59965eec58b481f60cfbdca77661ab0af7
+Subproject 040e818d7215b648e216c25fa51c6093e273f65