aboutsummaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt29
1 files changed, 7 insertions, 22 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 74c5fabb8..51ed27837 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -206,6 +206,9 @@ configure_file(
"${PROJECT_BINARY_DIR}/cmake_config.h"
)
+add_subdirectory(script)
+add_subdirectory(util)
+
set(common_SRCS
rollback_interface.cpp
rollback.cpp
@@ -222,22 +225,6 @@ 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
@@ -283,12 +270,8 @@ set(common_SRCS
staticobject.cpp
serverlist.cpp
pathfinder.cpp
- util/serialize.cpp
- util/directiontables.cpp
- util/numeric.cpp
- util/pointedthing.cpp
- util/string.cpp
- util/timetaker.cpp
+ ${SCRIPT_SRCS}
+ ${UTIL_SRCS}
)
# This gives us the icon
@@ -365,6 +348,7 @@ set(minetestserver_SRCS
include_directories(
${PROJECT_BINARY_DIR}
+ ${PROJECT_SOURCE_DIR}
${IRRLICHT_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${CMAKE_BUILD_TYPE}
@@ -375,6 +359,7 @@ include_directories(
${SQLITE3_INCLUDE_DIR}
${LUA_INCLUDE_DIR}
${JSON_INCLUDE_DIR}
+ ${PROJECT_SOURCE_DIR}/script
)
if(USE_FREETYPE)