Fix key change menu a bit

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c6419fcbef4fceccae257c62b6c28bbbf187796..3b3b326c454f9967ffef4a823507b737212616ea 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -94,18 +94,22 @@ configure_file(
 )
 
 set(common_SRCS
+       inventorymanager.cpp
+       mods.cpp
+       serverremoteplayer.cpp
+       content_abm.cpp
+       craftdef.cpp
        nameidmapping.cpp
        tooldef.cpp
        nodedef.cpp
+       craftitemdef.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_mapnode.cpp
        auth.cpp
        collision.cpp
@@ -155,9 +159,9 @@ endif()
 # Client sources
 set(minetest_SRCS
        ${common_SRCS}
-       MyBillboardSceneNode.cpp
        content_mapblock.cpp
        content_cao.cpp
+       mesh.cpp
        mapblock_mesh.cpp
        farmesh.cpp
        keycode.cpp
@@ -300,13 +304,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/textures/*.png")
-       install(FILES ${images} DESTINATION ${DATADIR}/textures)
+       #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})