Workaround for blocks having a huge amount of active objects; add log messages relate...

[minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 019f5ad7b135b85646b939a3fa3b41899b745885..afe8a58c03e07b9edae4c2eac24d2ea3dadff87a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -90,6 +90,7 @@ configure_file(
 )
 
 set(common_SRCS
+       log.cpp
        content_sao.cpp
        mapgen.cpp
        content_inventory.cpp
@@ -129,8 +130,16 @@ set(common_SRCS
 )
 
 # This gives us the icon
-if(WIN32 AND MSVC)
-       set(common_SRCS ${common_SRCS} winresource.rc)
+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