Allow server-side teleporting

[oweals/minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 019f5ad7b135b85646b939a3fa3b41899b745885..9d699e976bcf887388f0d1779faa17ef91e0ec11 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -84,12 +84,24 @@ endif()
 find_package(Jthread REQUIRED)
 find_package(Sqlite3 REQUIRED)
 
+# TODO: Create proper find script for Lua
+set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
+set(LUA_LIBRARY "lua")
+
 configure_file(
        "${PROJECT_SOURCE_DIR}/cmake_config.h.in"
        "${PROJECT_BINARY_DIR}/cmake_config.h"
 )
 
 set(common_SRCS
+       craftdef.cpp
+       nameidmapping.cpp
+       tooldef.cpp
+       nodedef.cpp
+       luaentity_common.cpp
+       scriptapi.cpp
+       script.cpp
+       log.cpp
        content_sao.cpp
        mapgen.cpp
        content_inventory.cpp
@@ -129,8 +141,16 @@ set(common_SRCS
 )
 
 # This gives us the icon
-if(WIN32 AND MSVC)
-       set(common_SRCS ${common_SRCS} winresource.rc)
+if(WIN32)
+       if(MINGW)
+               ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o
+                       COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR}
+                       -i${CMAKE_CURRENT_SOURCE_DIR}/winresource.rc
+                       -o ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
+               SET(common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
+       else(MINGW) # Probably MSVC
+               set(common_SRCS ${common_SRCS} winresource.rc)
+       endif(MINGW)
 endif()
 
 # Client sources
@@ -174,6 +194,7 @@ include_directories(
        ${GETTEXT_INCLUDE_DIR}
        ${JTHREAD_INCLUDE_DIR}
        ${SQLITE3_INCLUDE_DIR}
+       ${LUA_INCLUDE_DIR}
 )
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
@@ -192,6 +213,7 @@ if(BUILD_CLIENT)
                ${GETTEXT_LIBRARY}
                ${JTHREAD_LIBRARY}
                ${SQLITE3_LIBRARY}
+               ${LUA_LIBRARY}
                ${PLATFORM_LIBS}
                ${CLIENT_PLATFORM_LIBS}
        )
@@ -204,6 +226,7 @@ if(BUILD_SERVER)
                ${ZLIB_LIBRARIES}
                ${JTHREAD_LIBRARY}
                ${SQLITE3_LIBRARY}
+               ${LUA_LIBRARY}
                ${PLATFORM_LIBS}
        )
 endif(BUILD_SERVER)
@@ -283,9 +306,8 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION
 if(BUILD_CLIENT)
        install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
-       file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/*.png")
-
-       install(FILES ${images} DESTINATION ${DATADIR})
+       file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/textures/*.png")
+       install(FILES ${images} DESTINATION ${DATADIR}/textures)
 
        if(USE_GETTEXT)
                foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
@@ -352,7 +374,12 @@ endif (JTHREAD_FOUND)
 
 if (SQLITE3_FOUND)
 else (SQLITE3_FOUND)
-add_subdirectory(sqlite)
+       add_subdirectory(sqlite)
 endif (SQLITE3_FOUND)
 
+if (LUA_FOUND)
+else (LUA_FOUND)
+       add_subdirectory(lua)
+endif (LUA_FOUND)
+
 #end