Make dungeon masters though and make oerkkis disappear when they get to you (because...

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d95da35b148ff6b8e639d63a6e324477b3181d6..019f5ad7b135b85646b939a3fa3b41899b745885 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -74,7 +74,7 @@ else()
                endif(APPLE)
        endif(BUILD_CLIENT)
        find_package(ZLIB REQUIRED)
-       set(PLATFORM_LIBS -lpthread)
+       set(PLATFORM_LIBS -lpthread ${CMAKE_DL_LIBS})
        #set(CLIENT_PLATFORM_LIBS -lXxf86vm)
        # This way Xxf86vm is found on OpenBSD too
        find_library(XXF86VM_LIBRARY Xxf86vm)
@@ -95,7 +95,6 @@ set(common_SRCS
        content_inventory.cpp
        content_nodemeta.cpp
        content_craft.cpp
-       content_mapblock.cpp
        content_mapnode.cpp
        auth.cpp
        collision.cpp
@@ -108,7 +107,6 @@ set(common_SRCS
        defaultsettings.cpp
        mapnode.cpp
        voxel.cpp
-       mapblockobject.cpp
        inventory.cpp
        debug.cpp
        serialization.cpp
@@ -127,6 +125,7 @@ set(common_SRCS
        test.cpp
        sha1.cpp
        base64.cpp
+       ban.cpp
 )
 
 # This gives us the icon
@@ -137,10 +136,13 @@ endif()
 # Client sources
 set(minetest_SRCS
        ${common_SRCS}
+       MyBillboardSceneNode.cpp
+       content_mapblock.cpp
        content_cao.cpp
        mapblock_mesh.cpp
        farmesh.cpp
        keycode.cpp
+       camera.cpp
        clouds.cpp
        clientobject.cpp
        guiMainMenu.cpp
@@ -150,6 +152,7 @@ set(minetest_SRCS
        guiInventoryMenu.cpp
        guiPauseMenu.cpp
        guiPasswordChange.cpp
+       guiDeathScreen.cpp
        client.cpp
        tile.cpp
        game.cpp
@@ -173,7 +176,7 @@ include_directories(
        ${SQLITE3_INCLUDE_DIR}
 )
 
-set(EXECUTABLE_OUTPUT_PATH ../bin)
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
 
 if(BUILD_CLIENT)
        add_executable(${PROJECT_NAME} ${minetest_SRCS})
@@ -187,10 +190,10 @@ if(BUILD_CLIENT)
                ${PNG_LIBRARIES}
                ${X11_LIBRARIES}
                ${GETTEXT_LIBRARY}
-               ${PLATFORM_LIBS}
-               ${CLIENT_PLATFORM_LIBS}
                ${JTHREAD_LIBRARY}
                ${SQLITE3_LIBRARY}
+               ${PLATFORM_LIBS}
+               ${CLIENT_PLATFORM_LIBS}
        )
 endif(BUILD_CLIENT)
 
@@ -199,9 +202,9 @@ if(BUILD_SERVER)
        target_link_libraries(
                ${PROJECT_NAME}server
                ${ZLIB_LIBRARIES}
-               ${PLATFORM_LIBS}
                ${JTHREAD_LIBRARY}
                ${SQLITE3_LIBRARY}
+               ${PLATFORM_LIBS}
        )
 endif(BUILD_SERVER)
 
@@ -215,13 +218,17 @@ if(MSVC)
        # Visual Studio
 
        # 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_CXX_FLAGS_RELEASE "/EHa /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\" /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
        set(CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Ob0 /Od /RTC1")
+
+       # Flags for C files (sqlite)
+       # /MT = Link statically with standard library stuff
+       set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT")
        
        if(BUILD_SERVER)
                set_target_properties(${PROJECT_NAME}server PROPERTIES
@@ -237,7 +244,7 @@ else()
                set(RELEASE_WARNING_FLAGS "")
        endif()
        
-       if(NOT APPLE)
+       if(NOT APPLE AND NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
                CHECK_CXX_COMPILER_FLAG("-Wno-unused-but-set-variable" HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
                if(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
                        set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")