Add disable_jump and fall_damage_add_percent node groups

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3e9f6d35713e1543dfa1998a585cc020bca07d92..8cdaa510d891fd01842ffeb7488c45954fa9d24f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,6 @@
 project(minetest)
 cmake_minimum_required( VERSION 2.6 )
 
-if(RUN_IN_PLACE)
-       add_definitions ( -DRUN_IN_PLACE )
-endif(RUN_IN_PLACE)
-
 # Set some random things default to not being visible in the GUI
 mark_as_advanced(EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH)
 mark_as_advanced(JTHREAD_INCLUDE_DIR JTHREAD_LIBRARY)
@@ -139,13 +135,15 @@ else()
        #set(CLIENT_PLATFORM_LIBS -lXxf86vm)
        # This way Xxf86vm is found on OpenBSD too
        find_library(XXF86VM_LIBRARY Xxf86vm)
+       mark_as_advanced(XXF86VM_LIBRARY)
        set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
 endif()
 
 find_package(Jthread REQUIRED)
 find_package(Sqlite3 REQUIRED)
 
-# TODO: Create proper find script for Lua
+# 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")
 
@@ -155,6 +153,8 @@ configure_file(
 )
 
 set(common_SRCS
+       rollback_interface.cpp
+       rollback.cpp
        genericobject.cpp
        voxelalgorithms.cpp
        sound.cpp
@@ -193,7 +193,6 @@ set(common_SRCS
        connection.cpp
        environment.cpp
        server.cpp
-       servercommand.cpp
        socket.cpp
        mapblock.cpp
        mapsector.cpp
@@ -251,7 +250,7 @@ set(minetest_SRCS
        guiKeyChangeMenu.cpp
        guiMessageMenu.cpp
        guiTextInputMenu.cpp
-       guiInventoryMenu.cpp
+       guiFormSpecMenu.cpp
        guiPauseMenu.cpp
        guiPasswordChange.cpp
        guiDeathScreen.cpp