X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=e82e26dc7a2fa09e2979c72dd815b2ddf63fca8d;hb=6a76c226e10e92c3e3339096f07f8ab065e2098b;hp=92cf0fde962ca9d64f52b0fa07482c163899f24d;hpb=9e46cbf7ea512330f35d0f2ede0c7c0c085c7cf4;p=minetest.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 92cf0fde9..e82e26dc7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -84,17 +84,31 @@ endif()
 find_package(Jthread REQUIRED)
 find_package(Sqlite3 REQUIRED)
 
+# TODO: Create proper find script for Lua
+set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
+set(LUA_LIBRARY "lua")
+
 configure_file(
 	"${PROJECT_SOURCE_DIR}/cmake_config.h.in"
 	"${PROJECT_BINARY_DIR}/cmake_config.h"
 )
 
 set(common_SRCS
+	inventorymanager.cpp
+	mods.cpp
+	serverremoteplayer.cpp
+	content_abm.cpp
+	craftdef.cpp
+	nameidmapping.cpp
+	itemdef.cpp
+	nodedef.cpp
+	luaentity_common.cpp
+	scriptapi.cpp
+	script.cpp
+	log.cpp
 	content_sao.cpp
 	mapgen.cpp
-	content_inventory.cpp
 	content_nodemeta.cpp
-	content_craft.cpp
 	content_mapnode.cpp
 	auth.cpp
 	collision.cpp
@@ -107,7 +121,6 @@ set(common_SRCS
 	defaultsettings.cpp
 	mapnode.cpp
 	voxel.cpp
-	mapblockobject.cpp
 	inventory.cpp
 	debug.cpp
 	serialization.cpp
@@ -130,8 +143,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
@@ -139,6 +160,7 @@ set(minetest_SRCS
 	${common_SRCS}
 	content_mapblock.cpp
 	content_cao.cpp
+	mesh.cpp
 	mapblock_mesh.cpp
 	farmesh.cpp
 	keycode.cpp
@@ -152,6 +174,7 @@ set(minetest_SRCS
 	guiInventoryMenu.cpp
 	guiPauseMenu.cpp
 	guiPasswordChange.cpp
+	guiDeathScreen.cpp
 	client.cpp
 	tile.cpp
 	game.cpp
@@ -173,6 +196,7 @@ include_directories(
 	${GETTEXT_INCLUDE_DIR}
 	${JTHREAD_INCLUDE_DIR}
 	${SQLITE3_INCLUDE_DIR}
+	${LUA_INCLUDE_DIR}
 )
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
@@ -191,6 +215,7 @@ if(BUILD_CLIENT)
 		${GETTEXT_LIBRARY}
 		${JTHREAD_LIBRARY}
 		${SQLITE3_LIBRARY}
+		${LUA_LIBRARY}
 		${PLATFORM_LIBS}
 		${CLIENT_PLATFORM_LIBS}
 	)
@@ -203,6 +228,7 @@ if(BUILD_SERVER)
 		${ZLIB_LIBRARIES}
 		${JTHREAD_LIBRARY}
 		${SQLITE3_LIBRARY}
+		${LUA_LIBRARY}
 		${PLATFORM_LIBS}
 	)
 endif(BUILD_SERVER)
@@ -217,13 +243,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
@@ -273,14 +303,17 @@ endif()
 #
 
 # Example configuration file
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
+# NOTE: Install is handled elsewhere
+#install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
 
 if(BUILD_CLIENT)
 	install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
-	file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/*.png")
-
-	install(FILES ${images} DESTINATION ${DATADIR})
+	#file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/textures/*.png")
+	#install(FILES ${images} DESTINATION ${DATADIR}/textures)
+	#file(GLOB datasubstuff "${CMAKE_CURRENT_SOURCE_DIR}/../data/*")
+	#install(DIRECTORY "${datasubstuff}" DESTINATION ${DATADIR})
+	install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../data/" DESTINATION ${DATADIR})
 
 	if(USE_GETTEXT)
 		foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
@@ -347,7 +380,12 @@ endif (JTHREAD_FOUND)
 
 if (SQLITE3_FOUND)
 else (SQLITE3_FOUND)
-add_subdirectory(sqlite)
+	add_subdirectory(sqlite)
 endif (SQLITE3_FOUND)
 
+if (LUA_FOUND)
+else (LUA_FOUND)
+	add_subdirectory(lua)
+endif (LUA_FOUND)
+
 #end