diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/CMakeLists.txt | 18 | ||||
| m--------- | external/benchmark | 0 | ||||
| m--------- | external/corrade | 0 | ||||
| m--------- | external/fmt | 0 | ||||
| m--------- | external/imgui | 0 | ||||
| m--------- | external/luajit | 0 | ||||
| m--------- | external/magnum | 0 | ||||
| m--------- | external/magnum-integration | 0 | ||||
| m--------- | external/magnum-plugins | 0 | ||||
| m--------- | external/robin-map | 0 | ||||
| m--------- | external/sdl2 | 0 |
11 files changed, 1 insertions, 17 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index e258fa87..303afda2 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -237,9 +237,7 @@ set(system "") if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.25) set(system "SYSTEM") endif() -if(NOT FLOORMAT_SUBMODULE-DEPENDENCIES OR NOT FLOORMAT_SUBMODULE-SDL2) - add_subdirectory(sdl2 ${system}) -endif() + if(FLOORMAT_SUBMODULE-DEPENDENCIES) sets(PATH IMGUI_DIR "${CMAKE_CURRENT_SOURCE_DIR}/imgui") @@ -270,19 +268,6 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) install(TARGETS benchmark RUNTIME DESTINATION "bin") endfunction() - function(fm_add_luajit) - set(CMAKE_C_STANDARD 11) - set(CMAKE_C_EXTENSIONS 1) - unset(CMAKE_C_VISIBILITY_PRESET) - unset(CMAKE_VISIBILITY_INLINES_HIDDEN) - if(CMAKE_COMPILER_IS_GNUCXX) - # HACK - add_compile_options(-fno-sanitize=all) - add_link_options(-fno-sanitize=all) - add_subdirectory(luajit ${system}) - endif() - endfunction() - fm_run_hook(fm-userconfig-external) function(fm_add_libs) @@ -297,7 +282,6 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) fm_add_benchmark() endif() fm_add_sdl2() - #fm_add_luajit() if(MSVC) add_compile_options(-GR-) else() diff --git a/external/benchmark b/external/benchmark -Subproject b40db869451036d222d155bc8cd6420c2fb9527 +Subproject b884717437fc468929cd47ca6a374005357ff18 diff --git a/external/corrade b/external/corrade -Subproject 1bc62dcd1430d93070343dc0d32b6a7db359ecb +Subproject 76d9b27792c1b4ff948a84870b34f805be08da4 diff --git a/external/fmt b/external/fmt -Subproject 6159e2b0ab58e6e22164272d22e929cbc9e34e2 +Subproject f2cec917dafffa45d5cb4573c68fdf706e2b541 diff --git a/external/imgui b/external/imgui -Subproject c554c402d307e6fde50e895adad009e23343ed2 +Subproject 2d20e13746c05bfe36d4a57ac465e7a9fe9005d diff --git a/external/luajit b/external/luajit deleted file mode 160000 -Subproject 0a29d98f56c1efe1c731c3da22e871e6ccb79d2 diff --git a/external/magnum b/external/magnum -Subproject 4dd86be6376275c0620d2470c2038f331462702 +Subproject 2af1aa24ab92b9fe92a79b8b2ba697ed20c668e diff --git a/external/magnum-integration b/external/magnum-integration -Subproject bf09698491f2061733dc263f375da1f02f41d8e +Subproject ed2730d95836fdcbdbb659c5c070bcde2eb0717 diff --git a/external/magnum-plugins b/external/magnum-plugins -Subproject 9a46ddaf4e7702954c76c12ff00cf9e15fc7b61 +Subproject 790d645741f4be0ce898691a8c9a99c2d9a5c8e diff --git a/external/robin-map b/external/robin-map -Subproject 3bf03fdc4f71f86b496bb73a4fda6034e44fdb8 +Subproject e662db269a48da97fdc480072519cd94b51ece4 diff --git a/external/sdl2 b/external/sdl2 -Subproject a29f37c14abc2ae418e770353657e872a70d90b +Subproject 28472738857ff194b5b6b8778a1975cb605210a |