Fix RUN_IN_PLACE broken due to invalid usage of assert

[minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ce1cc30bfca34d16eb4fd83ddfda508a39469f3a..d56ec18c0539ac43ef135d5673b6104e0598fb6c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -352,6 +352,7 @@ add_custom_target(GenerateVersion
        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_subdirectory(jthread)
+add_subdirectory(network)
 add_subdirectory(script)
 add_subdirectory(util)
 
@@ -361,7 +362,6 @@ set (unittests_SRCS
 
 set(common_SRCS
        ban.cpp
-       base64.cpp
        cavegen.cpp
        clientiface.cpp
        collision.cpp
@@ -421,7 +421,6 @@ set(common_SRCS
        serverlist.cpp
        serverobject.cpp
        settings.cpp
-       sha1.cpp
        socket.cpp
        sound.cpp
        staticobject.cpp
@@ -431,10 +430,7 @@ set(common_SRCS
        version.cpp
        voxel.cpp
        voxelalgorithms.cpp
-       network/connection.cpp
-       network/networkpacket.cpp
-       network/packethandlers/server.cpp
-       network/serveropcodes.cpp
+       ${common_network_SRCS}
        ${JTHREAD_SRCS}
        ${common_SCRIPT_SRCS}
        ${UTIL_SRCS}
@@ -461,9 +457,16 @@ if(WIN32)
 endif()
 
 # Client sources
+
+if (BUILD_CLIENT)
+       add_subdirectory(client)
+endif(BUILD_CLIENT)
+
 set(minetest_SRCS
        ${common_SRCS}
        ${sound_SRCS}
+       ${client_SRCS}
+       ${client_network_SRCS}
        camera.cpp
        chat.cpp
        client.cpp
@@ -496,11 +499,7 @@ set(minetest_SRCS
        particles.cpp
        shader.cpp
        sky.cpp
-       tile.cpp
        wieldmesh.cpp
-       client/clientlauncher.cpp
-       network/clientopcodes.cpp
-       network/packethandlers/client.cpp
        ${minetest_SCRIPT_SRCS}
 )
 list(SORT minetest_SRCS)