Fix world selection a bit (also fixes a main menu segfault)

[minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c06da20c4bfaa623c13d5e720c316ada8f518c95..74c5fabb87023cb0fe0636f6553b066b6bbd2b21 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -161,7 +161,7 @@ else()
                endif(APPLE)
        endif(BUILD_CLIENT)
        find_package(ZLIB REQUIRED)
-       set(PLATFORM_LIBS -lpthread ${CMAKE_DL_LIBS})
+       set(PLATFORM_LIBS -lpthread -lrt ${CMAKE_DL_LIBS})
        #set(CLIENT_PLATFORM_LIBS -lXxf86vm)
        # This way Xxf86vm is found on OpenBSD too
        find_library(XXF86VM_LIBRARY Xxf86vm)
@@ -172,6 +172,7 @@ endif()
 find_package(Jthread REQUIRED)
 find_package(Sqlite3 REQUIRED)
 find_package(Json REQUIRED)
+find_package(OpenGLES2)
 
 if(USE_FREETYPE)
        find_package(Freetype REQUIRED)
@@ -179,10 +180,26 @@ if(USE_FREETYPE)
        set(CGUITTFONT_LIBRARY cguittfont)
 endif(USE_FREETYPE)
 
-# Do not use system-wide installation of Lua, because it'll likely be a
-# different version and/or has different build options.
-set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
-set(LUA_LIBRARY "lua")
+
+find_library(LUA_LIBRARY luajit
+               NAMES luajit-5.1)
+find_path(LUA_INCLUDE_DIR luajit.h
+       NAMES luajit.h
+       PATH_SUFFIXES luajit-2.0)
+message (STATUS "LuaJIT library: ${LUA_LIBRARY}")
+message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
+
+if(LUA_LIBRARY AND LUA_INCLUDE_DIR) 
+       message (STATUS "LuaJIT found.")
+else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
+       message (STATUS "LuaJIT not found, using bundled Lua.")
+       set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
+       set(LUA_LIBRARY "lua")
+       add_subdirectory(lua)
+endif(LUA_LIBRARY AND LUA_INCLUDE_DIR)
+
+mark_as_advanced(LUA_LIBRARY)
+mark_as_advanced(LUA_INCLUDE_DIR)
 
 configure_file(
        "${PROJECT_SOURCE_DIR}/cmake_config.h.in"
@@ -205,13 +222,33 @@ set(common_SRCS
        itemdef.cpp
        nodedef.cpp
        object_properties.cpp
+       scriptapi_types.cpp
+       scriptapi_common.cpp
+       scriptapi_content.cpp
+       scriptapi_craft.cpp
+       scriptapi_node.cpp
+       scriptapi_item.cpp
+       scriptapi_env.cpp
+       scriptapi_nodetimer.cpp
+       scriptapi_noise.cpp
+       scriptapi_entity.cpp
+       scriptapi_object.cpp
+       scriptapi_nodemeta.cpp
+       scriptapi_inventory.cpp
+       scriptapi_particles.cpp
        scriptapi.cpp
        script.cpp
        log.cpp
        content_sao.cpp
+       emerge.cpp
        mapgen.cpp
        mapgen_v6.cpp
+       mapgen_v7.cpp
+       mapgen_indev.cpp
+       mapgen_singlenode.cpp
        treegen.cpp
+       dungeongen.cpp
+       cavegen.cpp
        content_nodemeta.cpp
        content_mapnode.cpp
        collision.cpp
@@ -245,6 +282,7 @@ set(common_SRCS
        clientserver.cpp
        staticobject.cpp
        serverlist.cpp
+       pathfinder.cpp
        util/serialize.cpp
        util/directiontables.cpp
        util/numeric.cpp
@@ -290,6 +328,7 @@ set(minetest_SRCS
        particles.cpp
        clientobject.cpp
        chat.cpp
+       hud.cpp
        guiMainMenu.cpp
        guiKeyChangeMenu.cpp
        guiMessageMenu.cpp
@@ -370,6 +409,7 @@ if(BUILD_CLIENT)
                ${SQLITE3_LIBRARY}
                ${LUA_LIBRARY}
                ${JSON_LIBRARY}
+               ${OPENGLES2_LIBRARIES}
                ${PLATFORM_LIBS}
                ${CLIENT_PLATFORM_LIBS}
        )
@@ -579,11 +619,6 @@ if (BUILD_CLIENT AND USE_FREETYPE)
        add_subdirectory(cguittfont)
 endif (BUILD_CLIENT AND USE_FREETYPE)
 
-if (LUA_FOUND)
-else (LUA_FOUND)
-       add_subdirectory(lua)
-endif (LUA_FOUND)
-
 if (JSON_FOUND)
 else (JSON_FOUND)
        add_subdirectory(json)