Use single box for halo mesh

[minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dfbd2f5d8c84ab717651969bbd6c7300e778159e..0b84ff85aaaa80fb8badf357778df67817367730 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -155,8 +155,23 @@ if(ENABLE_FREETYPE)
        endif()
 endif(ENABLE_FREETYPE)
 
-
-find_package(Lua REQUIRED)
+# LuaJIT
+option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE)
+set(USE_LUAJIT FALSE)
+if(ENABLE_LUAJIT)
+       find_package(LuaJIT)
+       if(LUAJIT_FOUND)
+               set(USE_LUAJIT TRUE)
+       endif(LUAJIT_FOUND)
+else()
+       message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)")
+endif()
+if(NOT USE_LUAJIT)
+       message(STATUS "LuaJIT not found, using bundled Lua.")
+       set(LUA_LIBRARY "lua")
+       set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
+       add_subdirectory(lua)
+endif()
 
 find_package(GMP REQUIRED)
 
@@ -373,6 +388,7 @@ set(common_SRCS
        mapgen_v5.cpp
        mapgen_v6.cpp
        mapgen_v7.cpp
+       mapgen_valleys.cpp
        mapnode.cpp
        mapsector.cpp
        mg_biome.cpp