guiFormspecMenu: Allow fraction values for container[] (#7497)

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c2b28832a19801093a06faf4483684d1a80ca9a6..60fff18ffb9a53da7a85698301a7840b06ea4b16 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,7 +57,7 @@ if(NOT USE_CURL)
 endif()
 
 
-option(ENABLE_GETTEXT "Use GetText for internationalization" FALSE)
+option(ENABLE_GETTEXT "Use GetText for internationalization" TRUE)
 set(USE_GETTEXT FALSE)
 
 if(ENABLE_GETTEXT)
@@ -101,19 +101,6 @@ if(BUILD_CLIENT AND ENABLE_SOUND)
        endif()
 endif()
 
-if(USE_SOUND)
-       set(sound_SRCS sound_openal.cpp)
-       set(SOUND_INCLUDE_DIRS
-               ${OPENAL_INCLUDE_DIR}
-               ${VORBIS_INCLUDE_DIR}
-               ${OGG_INCLUDE_DIR}
-               )
-       set(SOUND_LIBRARIES
-               ${OPENAL_LIBRARY}
-               ${VORBIS_LIBRARIES}
-               )
-endif()
-
 
 option(ENABLE_GLES "Enable OpenGL ES support" FALSE)
 mark_as_advanced(ENABLE_GLES)
@@ -336,12 +323,12 @@ else()
                endif(HAVE_LIBRT)
        endif(APPLE)
 
-       if(NOT HAIKU)
+       if(NOT HAIKU AND NOT APPLE)
        # This way Xxf86vm is found on OpenBSD too
                find_library(XXF86VM_LIBRARY Xxf86vm)
                mark_as_advanced(XXF86VM_LIBRARY)
                set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
-       endif(NOT HAIKU)
+       endif(NOT HAIKU AND NOT APPLE)
 
        # Prefer local iconv if installed
        find_library(ICONV_LIBRARY iconv)
@@ -371,6 +358,7 @@ add_custom_target(GenerateVersion
 
 
 add_subdirectory(threading)
+add_subdirectory(content)
 add_subdirectory(database)
 add_subdirectory(gui)
 add_subdirectory(mapgen)
@@ -379,10 +367,13 @@ add_subdirectory(script)
 add_subdirectory(unittest)
 add_subdirectory(util)
 add_subdirectory(irrlicht_changes)
+add_subdirectory(server)
 
 set(common_SRCS
        ${database_SRCS}
        ${mapgen_SRCS}
+       ${server_SRCS}
+       ${content_SRCS}
        ban.cpp
        chat.cpp
        clientiface.cpp
@@ -414,7 +405,6 @@ set(common_SRCS
        mapsector.cpp
        metadata.cpp
        modchannels.cpp
-       mods.cpp
        nameidmapping.cpp
        nodedef.cpp
        nodemetadata.cpp
@@ -438,9 +428,7 @@ set(common_SRCS
        serverlist.cpp
        serverobject.cpp
        settings.cpp
-       sound.cpp
        staticobject.cpp
-       subgame.cpp
        terminal_chat_console.cpp
        tileanimation.cpp
        tool.cpp
@@ -471,9 +459,9 @@ if(WIN32)
                        -o ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o
                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                        DEPENDS ${WINRESOURCE_FILE})
-               SET(common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
+               SET(extra_windows_SRCS ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
        else(MINGW) # Probably MSVC
-               set(common_SRCS ${common_SRCS} ${WINRESOURCE_FILE} ${MINETEST_EXE_MANIFEST_FILE})
+               set(extra_windows_SRCS ${WINRESOURCE_FILE} ${MINETEST_EXE_MANIFEST_FILE})
        endif(MINGW)
 endif()
 
@@ -487,7 +475,6 @@ set(client_SRCS
        ${client_SRCS}
        ${common_SRCS}
        ${gui_SRCS}
-       ${sound_SRCS}
        ${client_network_SRCS}
        ${client_irrlicht_changes_SRCS}
        camera.cpp
@@ -530,6 +517,13 @@ set(server_SRCS
 )
 list(SORT server_SRCS)
 
+# Avoid source_group on broken CMake version.
+# see issue #7074 #7075
+if (CMAKE_VERSION VERSION_GREATER 3.8.1)
+       source_group(TREE ${PROJECT_SOURCE_DIR} PREFIX "Source Files" FILES ${client_SRCS})
+       source_group(TREE ${PROJECT_SOURCE_DIR} PREFIX "Source Files" FILES ${server_SRCS})
+endif()
+
 include_directories(
        ${PROJECT_BINARY_DIR}
        ${PROJECT_SOURCE_DIR}
@@ -561,7 +555,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
 
 
 if(BUILD_CLIENT)
-       add_executable(${PROJECT_NAME} ${client_SRCS})
+       add_executable(${PROJECT_NAME} ${client_SRCS} ${extra_windows_SRCS})
        add_dependencies(${PROJECT_NAME} GenerateVersion)
        set(client_LIBS
                ${PROJECT_NAME}
@@ -629,7 +623,7 @@ endif(BUILD_CLIENT)
 
 
 if(BUILD_SERVER)
-       add_executable(${PROJECT_NAME}server ${server_SRCS})
+       add_executable(${PROJECT_NAME}server ${server_SRCS} ${extra_windows_SRCS})
        add_dependencies(${PROJECT_NAME}server GenerateVersion)
        target_link_libraries(
                ${PROJECT_NAME}server