Skip to content
Permalink
Browse files

Use proper CMakeLists.txt for network and client directories

  • Loading branch information
nerzhul committed Feb 21, 2015
1 parent 81930b1 commit cf4045ff0f7c96614e64b2b336e62a240f443ea6
Showing with 28 additions and 7 deletions.
  1. +9 −7 src/CMakeLists.txt
  2. +4 −0 src/client/CMakeLists.txt
  3. +15 −0 src/network/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)

@@ -431,10 +432,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 +459,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
@@ -498,9 +503,6 @@ set(minetest_SRCS
sky.cpp
tile.cpp
wieldmesh.cpp
client/clientlauncher.cpp
network/clientopcodes.cpp
network/packethandlers/client.cpp
${minetest_SCRIPT_SRCS}
)
list(SORT minetest_SRCS)
@@ -0,0 +1,4 @@
set(client_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/clientlauncher.cpp
PARENT_SCOPE
)
@@ -0,0 +1,15 @@
set(common_network_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/connection.cpp
${CMAKE_CURRENT_SOURCE_DIR}/networkpacket.cpp
${CMAKE_CURRENT_SOURCE_DIR}/packethandlers/server.cpp
${CMAKE_CURRENT_SOURCE_DIR}/serveropcodes.cpp
PARENT_SCOPE
)

if (BUILD_CLIENT)
set(client_network_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/clientopcodes.cpp
${CMAKE_CURRENT_SOURCE_DIR}/packethandlers/client.cpp
PARENT_SCOPE
)
endif(BUILD_CLIENT)

0 comments on commit cf4045f

Please sign in to comment.
You can’t perform that action at this time.