diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | external/CMakeLists.txt | 3 | ||||
| m--------- | external/luajit | 0 |
3 files changed, 5 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index fa870d96..fd4fc9fd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "fmt"] path = external/fmt url = https://github.com/fmtlib/fmt.git +[submodule "luajit"] + path = external/luajit + url = https://github.com/WohlSoft/LuaJIT.git diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index a5e03542..b82839f4 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -225,6 +225,8 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) unset(CMAKE_C_VISIBILITY_PRESET) unset(CMAKE_VISIBILITY_INLINES_HIDDEN) add_subdirectory(sdl2) + add_definitions(-UWIN32_LEAN_AND_MEAN) + add_subdirectory(luajit) endfunction() fm_add_libs() @@ -251,5 +253,4 @@ if(NOT FLOORMAT_SUBMODULE-DEPENDENCIES) endif() set(fm-quiet-message 0) - fm_run_hook(fm-userconfig-external-post) diff --git a/external/luajit b/external/luajit new file mode 160000 +Subproject ea8feaf0e6222e801be5499768ea84cc9572cb0 |