fix in readme

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b26294113ddf2b4cb2dfe09e3afce59c55c5a615..58596a10164f46e9237f3c1b06488e47c2371119 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
@@ -79,16 +82,21 @@ set(common_SRCS
 # 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
        client.cpp
        tile.cpp
+       game.cpp
        main.cpp
+       sha1.cpp
+       base64.cpp
 )
 
 # Server sources
@@ -102,17 +110,14 @@ include_directories(
        ${IRRLICHT_INCLUDE_DIR}
        ${ZLIB_INCLUDE_DIR}
        ${CMAKE_BUILD_TYPE}
-       "${PROJECT_SOURCE_DIR}/jthread"
        ${PNG_INCLUDE_DIR}
+       "${PROJECT_SOURCE_DIR}/jthread"
 )
 
 set(EXECUTABLE_OUTPUT_PATH ../bin)
 
-set(JTHREAD_LIBRARIES "jthread")
-set(JTHREAD_SRCS "")
-
 if(BUILD_CLIENT)
-       add_executable(minetest ${minetest_SRCS} ${JTHREAD_SRCS})
+       add_executable(minetest ${minetest_SRCS})
        target_link_libraries(
                minetest
                ${ZLIB_LIBRARIES}
@@ -122,19 +127,19 @@ if(BUILD_CLIENT)
                ${BZIP2_LIBRARIES}
                ${PNG_LIBRARIES}
                ${X11_LIBRARIES}
-               ${JTHREAD_LIBRARIES}
                ${PLATFORM_LIBS}
                ${CLIENT_PLATFORM_LIBS}
+               jthread
        )
 endif(BUILD_CLIENT)
 
 if(BUILD_SERVER)
-       add_executable(minetestserver ${minetestserver_SRCS} ${JTHREAD_SRCS})
+       add_executable(minetestserver ${minetestserver_SRCS})
        target_link_libraries(
                minetestserver
                ${ZLIB_LIBRARIES}
-               ${JTHREAD_LIBRARIES}
                ${PLATFORM_LIBS}
+               jthread
        )
 endif(BUILD_SERVER)
 
@@ -147,7 +152,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
@@ -167,6 +173,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")