Omnicleanup: header cleanup, add ModApiUtil shared between game and mainmenu

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c06da20c4bfaa623c13d5e720c316ada8f518c95..18cdaa725c6fe897d4b66df25385dafec50c1d1d 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,16 +180,35 @@ 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"
        "${PROJECT_BINARY_DIR}/cmake_config.h"
 )
 
+add_subdirectory(script)
+add_subdirectory(util)
+
 set(common_SRCS
        rollback_interface.cpp
        rollback.cpp
@@ -205,13 +225,18 @@ set(common_SRCS
        itemdef.cpp
        nodedef.cpp
        object_properties.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
+       mapgen_math.cpp
        treegen.cpp
+       dungeongen.cpp
+       cavegen.cpp
        content_nodemeta.cpp
        content_mapnode.cpp
        collision.cpp
@@ -242,15 +267,12 @@ set(common_SRCS
        base64.cpp
        ban.cpp
        biome.cpp
-       clientserver.cpp
        staticobject.cpp
        serverlist.cpp
-       util/serialize.cpp
-       util/directiontables.cpp
-       util/numeric.cpp
-       util/pointedthing.cpp
-       util/string.cpp
-       util/timetaker.cpp
+       pathfinder.cpp
+       convert_json.cpp
+       ${common_SCRIPT_SRCS}
+       ${UTIL_SRCS}
 )
 
 # This gives us the icon
@@ -283,14 +305,13 @@ set(minetest_SRCS
        content_cao.cpp
        mesh.cpp
        mapblock_mesh.cpp
-       farmesh.cpp
        keycode.cpp
        camera.cpp
        clouds.cpp
        particles.cpp
        clientobject.cpp
        chat.cpp
-       guiMainMenu.cpp
+       hud.cpp
        guiKeyChangeMenu.cpp
        guiMessageMenu.cpp
        guiTextInputMenu.cpp
@@ -300,15 +321,16 @@ set(minetest_SRCS
        guiVolumeChange.cpp
        guiDeathScreen.cpp
        guiChatConsole.cpp
-       guiCreateWorld.cpp
-       guiConfigureWorld.cpp
-       guiConfirmMenu.cpp
        client.cpp
        filecache.cpp
        tile.cpp
        shader.cpp
        game.cpp
        main.cpp
+       guiEngine.cpp
+       guiFileSelectMenu.cpp
+       convert_json.cpp
+       ${minetest_SCRIPT_SRCS}
 )
 
 if(USE_FREETYPE)
@@ -318,14 +340,18 @@ if(USE_FREETYPE)
        )
 endif(USE_FREETYPE)
 
+list(SORT minetest_SRCS)
+
 # Server sources
 set(minetestserver_SRCS
        ${common_SRCS}
        main.cpp
 )
+list(SORT minetestserver_SRCS)
 
 include_directories(
        ${PROJECT_BINARY_DIR}
+       ${PROJECT_SOURCE_DIR}
        ${IRRLICHT_INCLUDE_DIR}
        ${ZLIB_INCLUDE_DIR}
        ${CMAKE_BUILD_TYPE}
@@ -336,6 +362,7 @@ include_directories(
        ${SQLITE3_INCLUDE_DIR}
        ${LUA_INCLUDE_DIR}
        ${JSON_INCLUDE_DIR}
+       ${PROJECT_SOURCE_DIR}/script
 )
 
 if(USE_FREETYPE)
@@ -370,6 +397,7 @@ if(BUILD_CLIENT)
                ${SQLITE3_LIBRARY}
                ${LUA_LIBRARY}
                ${JSON_LIBRARY}
+               ${OPENGLES2_LIBRARIES}
                ${PLATFORM_LIBS}
                ${CLIENT_PLATFORM_LIBS}
        )
@@ -579,11 +607,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)