Initially split utility.h to multiple files in util/

[minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2558be9cb19254416c7c76ebe4741cae0129ab88..3243530381eaa2a0fa2ff421a20e7532b9942b7d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -67,7 +67,7 @@ endif(ENABLE_SOUND AND BUILD_CLIENT)
 
 if(SOUND_PROBLEM)
        message(FATAL_ERROR "Sound enabled, but cannot be used.\n"
-               "To continue, either fill in the required paths or disable sound.")
+               "To continue, either fill in the required paths or disable sound. (-DENABLE_SOUND=0)")
 endif()
 if(USE_SOUND)
        set(sound_SRCS sound_openal.cpp)
@@ -106,6 +106,8 @@ if(WIN32)
                        CACHE FILEPATH "Path to zlibwapi.dll (for installation)")
        set(IRRLICHT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../irrlicht-1.7.2"
                        CACHE PATH "irrlicht dir")
+       set(MINGWM10_DLL ""
+                       CACHE FILEPATH "Path to mingwm10.dll (for installation)")
        if(ENABLE_SOUND)
                set(OPENAL_DLL "" CACHE FILEPATH "Path to OpenAL32.dll for installation (optional)")
                set(OGG_DLL "" CACHE FILEPATH "Path to libogg.dll for installation (optional)")
@@ -153,6 +155,7 @@ configure_file(
 )
 
 set(common_SRCS
+       genericobject.cpp
        voxelalgorithms.cpp
        sound.cpp
        quicktune.cpp
@@ -164,7 +167,7 @@ set(common_SRCS
        nameidmapping.cpp
        itemdef.cpp
        nodedef.cpp
-       luaentity_common.cpp
+       object_properties.cpp
        scriptapi.cpp
        script.cpp
        log.cpp
@@ -172,9 +175,9 @@ set(common_SRCS
        mapgen.cpp
        content_nodemeta.cpp
        content_mapnode.cpp
-       auth.cpp
        collision.cpp
        nodemetadata.cpp
+       nodetimer.cpp
        serverobject.cpp
        noise.cpp
        porting.cpp
@@ -201,18 +204,29 @@ set(common_SRCS
        sha1.cpp
        base64.cpp
        ban.cpp
+       util/serialize.cpp
+       util/directiontables.cpp
+       util/numeric.cpp
+       util/pointedthing.cpp
+       util/string.cpp
+       util/timetaker.cpp
 )
 
 # This gives us the icon
 if(WIN32)
+       set(WINRESOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../misc/winresource.rc)
        if(MINGW)
+               if(NOT CMAKE_RC_COMPILER)
+                       set(CMAKE_RC_COMPILER "windres.exe")
+               endif()
                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)
+                       COMMAND ${CMAKE_RC_COMPILER} -I${CMAKE_CURRENT_SOURCE_DIR}
+                       -i${WINRESOURCE_FILE}
+                       -o ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o
+                       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
                SET(common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
        else(MINGW) # Probably MSVC
-               set(common_SRCS ${common_SRCS} winresource.rc)
+               set(common_SRCS ${common_SRCS} ${WINRESOURCE_FILE})
        endif(MINGW)
 endif()
 
@@ -220,6 +234,7 @@ endif()
 set(minetest_SRCS
        ${common_SRCS}
        ${sound_SRCS}
+       localplayer.cpp
        sky.cpp
        clientmap.cpp
        content_cso.cpp
@@ -347,14 +362,18 @@ else()
                        set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
                endif(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
        endif()
-       
+
+       if(MINGW)
+               set(OTHER_FLAGS "-mthreads -fexceptions")
+       endif()
+
        if(APPLE)
                set(CMAKE_OSX_ARCHITECTURES i386 CACHE STRING "do not build for 64-bit" FORCE)
                set(ARCH i386)
        endif()
 
-       set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
-       set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS}")
+       set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
+       set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS}")
 
        if(USE_GPROF)
                set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")
@@ -374,6 +393,9 @@ endif()
 # Installation
 #
 if(WIN32)
+       if(MINGWM10_DLL)
+               install(FILES ${MINGWM10_DLL} DESTINATION ${BINDIR})
+       endif()
        if(DEFINED ZLIB_DLL)
                install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
        endif()