utility.h: Change Buffer's interface to be more compatible with SharedBuffer's interf...

[oweals/minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c897f4bf3514bd26fe3b7ea0378e9b49e0fbe526..afe8a58c03e07b9edae4c2eac24d2ea3dadff87a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,15 +1,19 @@
-project(minetest-delta)
+project(minetest)
 cmake_minimum_required( VERSION 2.6 )
 
 if(RUN_IN_PLACE)
        add_definitions ( -DRUN_IN_PLACE )
 endif(RUN_IN_PLACE)
 
-OPTION(USE_GETTEXT "Use GetText for internationalization" ON)
+# user-visible option to enable/disable gettext usage
+OPTION(ENABLE_GETTEXT "Use GetText for internationalization" ON)
+
+# this is only set to 1 if gettext is enabled _and_ available
+set(USE_GETTEXT 0)
 
 find_package(GettextLib)
 
-if(GETTEXT_FOUND AND USE_GETTEXT)
+if(GETTEXT_FOUND AND ENABLE_GETTEXT)
        message(STATUS "gettext include path: ${GETTEXT_INCLUDE_DIR}")
        message(STATUS "gettext msgfmt path: ${GETTEXT_MSGFMT}")
        if(WIN32)
@@ -17,12 +21,13 @@ if(GETTEXT_FOUND AND USE_GETTEXT)
                message(STATUS "gettext dll: ${GETTEXT_DLL}")
                message(STATUS "gettext iconv dll: ${GETTEXT_ICONV_DLL}")
        endif()
+       set(USE_GETTEXT 1)
        message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
-elseif(GETTEXT_FOUND AND NOT USE_GETTEXT)
+elseif(GETTEXT_FOUND AND NOT ENABLE_GETTEXT)
        MESSAGE(STATUS "GetText found but disabled;")
-else(GETTEXT_FOUND AND USE_GETTEXT)
+else(GETTEXT_FOUND AND ENABLE_GETTEXT)
        message(STATUS "GetText disabled")
-endif(GETTEXT_FOUND AND USE_GETTEXT)
+endif(GETTEXT_FOUND AND ENABLE_GETTEXT)
 
 if(NOT MSVC)
        set(USE_GPROF 0 CACHE BOOL "Use -pg flag for g++")
@@ -69,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)
@@ -85,12 +90,12 @@ configure_file(
 )
 
 set(common_SRCS
+       log.cpp
        content_sao.cpp
        mapgen.cpp
        content_inventory.cpp
        content_nodemeta.cpp
        content_craft.cpp
-       content_mapblock.cpp
        content_mapnode.cpp
        auth.cpp
        collision.cpp
@@ -103,7 +108,6 @@ set(common_SRCS
        defaultsettings.cpp
        mapnode.cpp
        voxel.cpp
-       mapblockobject.cpp
        inventory.cpp
        debug.cpp
        serialization.cpp
@@ -122,15 +126,32 @@ set(common_SRCS
        test.cpp
        sha1.cpp
        base64.cpp
+       ban.cpp
 )
 
+# This gives us the icon
+if(WIN32)
+       if(MINGW)
+               ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o
+                       COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR}
+                       -i${CMAKE_CURRENT_SOURCE_DIR}/winresource.rc
+                       -o ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
+               SET(common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
+       else(MINGW) # Probably MSVC
+               set(common_SRCS ${common_SRCS} winresource.rc)
+       endif(MINGW)
+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
@@ -140,6 +161,7 @@ set(minetest_SRCS
        guiInventoryMenu.cpp
        guiPauseMenu.cpp
        guiPasswordChange.cpp
+       guiDeathScreen.cpp
        client.cpp
        tile.cpp
        game.cpp
@@ -163,7 +185,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})
@@ -177,10 +199,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)
 
@@ -189,9 +211,9 @@ if(BUILD_SERVER)
        target_link_libraries(
                ${PROJECT_NAME}server
                ${ZLIB_LIBRARIES}
-               ${PLATFORM_LIBS}
                ${JTHREAD_LIBRARY}
                ${SQLITE3_LIBRARY}
+               ${PLATFORM_LIBS}
        )
 endif(BUILD_SERVER)
 
@@ -199,17 +221,23 @@ endif(BUILD_SERVER)
 # Set some optimizations and tweaks
 #
 
+include(CheckCXXCompilerFlag)
+
 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
@@ -225,8 +253,11 @@ else()
                set(RELEASE_WARNING_FLAGS "")
        endif()
        
-       if(NOT APPLE)
-               set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
+       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")
+               endif(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
        endif()
        
        if(APPLE)
@@ -265,7 +296,7 @@ if(BUILD_CLIENT)
 
        install(FILES ${images} DESTINATION ${DATADIR})
 
-       if(GETTEXT_FOUND AND USE_GETTEXT)
+       if(USE_GETTEXT)
                foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
                        set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
                        set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
@@ -280,14 +311,14 @@ if(BUILD_CLIENT)
                if(DEFINED ZLIB_DLL)
                        install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
                endif()
-               if(GETTEXT_FOUND AND USE_GETTEXT)
+               if(USE_GETTEXT)
                        if(DEFINED GETTEXT_DLL)
                                install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR})
                        endif()
                        if(DEFINED GETTEXT_ICONV_DLL)
                                install(FILES ${GETTEXT_ICONV_DLL} DESTINATION ${BINDIR})
                        endif()
-               endif(GETTEXT_FOUND AND USE_GETTEXT)
+               endif(USE_GETTEXT)
        endif()
 endif(BUILD_CLIENT)
 
@@ -295,7 +326,7 @@ if(BUILD_SERVER)
        install(TARGETS ${PROJECT_NAME}server DESTINATION ${BINDIR})
 endif(BUILD_SERVER)
 
-if (GETTEXT_FOUND AND USE_GETTEXT)
+if (USE_GETTEXT)
        set(MO_FILES)
 
        foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
@@ -319,7 +350,7 @@ if (GETTEXT_FOUND AND USE_GETTEXT)
        endforeach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
 
        add_custom_target(translations ALL COMMENT "mo update" DEPENDS ${MO_FILES})
-endif(GETTEXT_FOUND AND USE_GETTEXT)
+endif(USE_GETTEXT)
 
 # Subdirectories