+ clay and associated items

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 01ab2df5db7e26a58c566cb0f1b4072c53242eb5..49982d310e62565989a56b628e022c0ed849a013 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,6 +50,8 @@ configure_file(
 )
 
 set(common_SRCS
+       collision.cpp
+       nodemetadata.cpp
        serverobject.cpp
        noise.cpp
        mineral.cpp
@@ -67,6 +69,7 @@ set(common_SRCS
        connection.cpp
        environment.cpp
        server.cpp
+       servercommand.cpp
        socket.cpp
        mapblock.cpp
        mapsector.cpp
@@ -74,20 +77,26 @@ set(common_SRCS
        player.cpp
        utility.cpp
        test.cpp
+       sha1.cpp
+       base64.cpp
 )
 
 # Client sources
 set(minetest_SRCS
        ${common_SRCS}
+       keycode.cpp
+       clouds.cpp
        clientobject.cpp
+       guiFurnaceMenu.cpp
        guiMainMenu.cpp
        guiMessageMenu.cpp
        guiTextInputMenu.cpp
        guiInventoryMenu.cpp
        guiPauseMenu.cpp
-       irrlichtwrapper.cpp
+       guiPasswordChange.cpp
        client.cpp
        tile.cpp
+       game.cpp
        main.cpp
 )
 
@@ -104,7 +113,6 @@ include_directories(
        ${CMAKE_BUILD_TYPE}
        ${PNG_INCLUDE_DIR}
        "${PROJECT_SOURCE_DIR}/jthread"
-       "${PROJECT_SOURCE_DIR}/lua/src"
 )
 
 set(EXECUTABLE_OUTPUT_PATH ../bin)
@@ -123,9 +131,7 @@ if(BUILD_CLIENT)
                ${PLATFORM_LIBS}
                ${CLIENT_PLATFORM_LIBS}
                jthread
-               lua
        )
-       #${CMAKE_CURRENT_SOURCE_DIR}/lua/build/liblua
 endif(BUILD_CLIENT)
 
 if(BUILD_SERVER)
@@ -135,7 +141,6 @@ if(BUILD_SERVER)
                ${ZLIB_LIBRARIES}
                ${PLATFORM_LIBS}
                jthread
-               lua
        )
 endif(BUILD_SERVER)
 
@@ -148,7 +153,8 @@ if(MSVC)
 
        # 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_EXE_LINKER_FLAGS_RELEASE "/LTCG /NODEFAULTLIB:\"libcmtd.lib\"")
+       #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
@@ -168,6 +174,8 @@ else()
                set(WARNING_FLAGS "")
        endif()
 
+       set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
+
        set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
        set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall")
 
@@ -192,8 +200,6 @@ endif()
 # Example configuration file
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
 
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../data/scripts" DESTINATION ${DATADIR})
-
 if(BUILD_CLIENT)
        install(TARGETS minetest DESTINATION ${BINDIR})
 
@@ -218,6 +224,5 @@ endif(BUILD_SERVER)
 # Subdirectories
 
 add_subdirectory(jthread)
-add_subdirectory(lua)
 
 #end