Clean up log messages everywhere

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c18bb64a70ddaea2272d2ac53312cc4e7cf1e754..e1cfcfa09d8956f2b4469961eb9ffa605bb500a3 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -84,31 +84,42 @@ 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
+       inventorymanager.cpp
+       mods.cpp
+       serverremoteplayer.cpp
+       content_abm.cpp
+       craftdef.cpp
+       nameidmapping.cpp
+       itemdef.cpp
+       nodedef.cpp
+       luaentity_common.cpp
+       scriptapi.cpp
+       script.cpp
+       log.cpp
        content_sao.cpp
        mapgen.cpp
-       content_inventory.cpp
        content_nodemeta.cpp
-       content_craft.cpp
-       content_mapblock.cpp
        content_mapnode.cpp
        auth.cpp
        collision.cpp
        nodemetadata.cpp
        serverobject.cpp
        noise.cpp
-       mineral.cpp
        porting.cpp
-       materials.cpp
+       tool.cpp
        defaultsettings.cpp
        mapnode.cpp
        voxel.cpp
-       mapblockobject.cpp
        inventory.cpp
        debug.cpp
        serialization.cpp
@@ -131,19 +142,32 @@ 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
 set(minetest_SRCS
        ${common_SRCS}
+       content_cso.cpp
+       content_mapblock.cpp
        content_cao.cpp
+       mesh.cpp
        mapblock_mesh.cpp
        farmesh.cpp
        keycode.cpp
+       camera.cpp
        clouds.cpp
        clientobject.cpp
+       chat.cpp
        guiMainMenu.cpp
        guiKeyChangeMenu.cpp
        guiMessageMenu.cpp
@@ -151,6 +175,8 @@ set(minetest_SRCS
        guiInventoryMenu.cpp
        guiPauseMenu.cpp
        guiPasswordChange.cpp
+       guiDeathScreen.cpp
+       guiChatConsole.cpp
        client.cpp
        tile.cpp
        game.cpp
@@ -160,7 +186,7 @@ set(minetest_SRCS
 # Server sources
 set(minetestserver_SRCS
        ${common_SRCS}
-       servermain.cpp
+       main.cpp
 )
 
 include_directories(
@@ -172,6 +198,7 @@ include_directories(
        ${GETTEXT_INCLUDE_DIR}
        ${JTHREAD_INCLUDE_DIR}
        ${SQLITE3_INCLUDE_DIR}
+       ${LUA_INCLUDE_DIR}
 )
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
@@ -190,6 +217,7 @@ if(BUILD_CLIENT)
                ${GETTEXT_LIBRARY}
                ${JTHREAD_LIBRARY}
                ${SQLITE3_LIBRARY}
+               ${LUA_LIBRARY}
                ${PLATFORM_LIBS}
                ${CLIENT_PLATFORM_LIBS}
        )
@@ -202,6 +230,7 @@ if(BUILD_SERVER)
                ${ZLIB_LIBRARIES}
                ${JTHREAD_LIBRARY}
                ${SQLITE3_LIBRARY}
+               ${LUA_LIBRARY}
                ${PLATFORM_LIBS}
        )
 endif(BUILD_SERVER)
@@ -216,13 +245,17 @@ if(MSVC)
        # Visual Studio
 
        # EHa enables SEH exceptions (used for catching segfaults)
-       set(CMAKE_CXX_FLAGS_RELEASE "/EHa /MD /O2 /Ob2 /Oi /Ot /Oy /GL /FD /MT /GS- /arch:SSE /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP")
+       set(CMAKE_CXX_FLAGS_RELEASE "/EHa /O2 /Ob2 /Oi /Ot /Oy /GL /FD /MT /GS- /arch:SSE /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP")
        #set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /NODEFAULTLIB:\"libcmtd.lib\" /NODEFAULTLIB:\"libcmt.lib\"")
        set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG")
 
        # Debug build doesn't catch exceptions by itself
        # Add some optimizations because otherwise it's VERY slow
        set(CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Ob0 /Od /RTC1")
+
+       # Flags for C files (sqlite)
+       # /MT = Link statically with standard library stuff
+       set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT")
        
        if(BUILD_SERVER)
                set_target_properties(${PROJECT_NAME}server PROPERTIES
@@ -272,14 +305,17 @@ endif()
 #
 
 # Example configuration file
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
+# NOTE: Install is handled elsewhere
+#install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
 
 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)
+       #file(GLOB datasubstuff "${CMAKE_CURRENT_SOURCE_DIR}/../data/*")
+       #install(DIRECTORY "${datasubstuff}" DESTINATION ${DATADIR})
+       install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../data/" DESTINATION ${DATADIR})
 
        if(USE_GETTEXT)
                foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
@@ -346,7 +382,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