CMake stuff works now on linux and windows... and should be possible to make to work on OS X.

1 files changed, 152 insertions, 25 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 72a159f16..083395271 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,19 +1,37 @@
 project(minetest)
 cmake_minimum_required( VERSION 2.6 )
-set ( CMAKE_BUILD_TYPE Debug )
-add_definitions ( -Wall -DRUN_IN_PLACE -O2)
-find_package(ZLIB REQUIRED)
-find_package(X11 REQUIRED)
-find_package(OpenGL REQUIRED)
-find_package(JPEG REQUIRED)
-find_package(BZip2 REQUIRED)
 
-if( UNIX )
-  #set( platform_SRCS some_necessary_linux_file.cpp )
-else( UNIX )
-  #windows
-  #set( platform_SRCS dllmain.cpp stdafx.cpp )
-endif( UNIX )
+if(RUN_IN_PLACE)
+	add_definitions ( -DRUN_IN_PLACE )
+endif(RUN_IN_PLACE)
+
+if(UNIX)
+	# Unix
+	if(BUILD_CLIENT)
+		find_package(X11 REQUIRED)
+		find_package(OpenGL REQUIRED)
+		find_package(JPEG REQUIRED)
+		find_package(BZip2 REQUIRED)
+	endif(BUILD_CLIENT)
+	find_package(ZLIB REQUIRED)
+	set(SERVER_PLATFORM_LIBS -lpthread)
+elseif(WIN32)
+	# Windows
+	# Surpress some warnings
+	add_definitions ( /D "_CRT_SECURE_NO_DEPRECATE" /W1 )
+	# Zlib stuff
+	set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/../../zlib/zlib-1.2.5"
+			CACHE PATH "Zlib include directory")
+	set(ZLIB_LIBRARIES "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.lib"
+			CACHE PATH "Path to zlibwapi.lib")
+	set(ZLIB_DLL "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.dll"
+			CACHE PATH "Path to zlibwapi.dll (for installation)")
+endif()
+
+configure_file(
+	"${PROJECT_SOURCE_DIR}/config.h.in"
+	"${PROJECT_BINARY_DIR}/config.h"
+)
 
 set(minetest_SRCS
 	porting.cpp
@@ -48,26 +66,135 @@ set(minetest_SRCS
 	test.cpp
 )
 
+set(minetestserver_SRCS
+	porting.cpp
+	materials.cpp
+	defaultsettings.cpp
+	mapnode.cpp
+	voxel.cpp
+	mapblockobject.cpp
+	inventory.cpp
+	debug.cpp
+	serialization.cpp
+	light.cpp
+	filesys.cpp
+	connection.cpp
+	environment.cpp
+	server.cpp
+	socket.cpp
+	mapblock.cpp
+	mapsector.cpp
+	heightmap.cpp
+	map.cpp
+	player.cpp
+	utility.cpp
+	servermain.cpp
+	test.cpp
+)
+
 include_directories(
-	${ZLIB_INCLUDE_DIR}
+	${PROJECT_BINARY_DIR}
 	${IRRLICHT_INCLUDE_DIR}
+	${ZLIB_INCLUDE_DIR}
+	${CMAKE_BUILD_TYPE}
 	"${PROJECT_SOURCE_DIR}/jthread"
 )
 
 set(EXECUTABLE_OUTPUT_PATH ../bin)
 
-add_executable(minetest ${minetest_SRCS})
+if(BUILD_CLIENT)
+	add_executable(minetest ${minetest_SRCS})
+	target_link_libraries(
+		minetest
+		${ZLIB_LIBRARIES}
+		${IRRLICHT_LIBRARY}
+		${OPENGL_LIBRARIES}
+		${JPEG_LIBRARIES}
+		${BZIP2_LIBRARIES}
+		jthread
+	)
+endif(BUILD_CLIENT)
+if(BUILD_SERVER)
+	add_executable(minetestserver ${minetestserver_SRCS})
+	target_link_libraries(
+		minetestserver
+		${ZLIB_LIBRARIES}
+		jthread
+		${SERVER_PLATFORM_LIBS}
+	)
+endif(BUILD_SERVER)
 
-target_link_libraries(
-	minetest
-	${ZLIB_LIBRARIES}
-	${IRRLICHT_LIBRARY}
-	${OPENGL_LIBRARIES}
-	${JPEG_LIBRARIES}
-	${BZIP2_LIBRARIES}
-	jthread
-)
+# Set some optimizations and tweaks
+if( UNIX )
+	# Unix
+	
+	set(UNIX_FLAGS "-Wall")
+
+	if(BUILD_CLIENT)
+		set_target_properties(minetest PROPERTIES COMPILE_FLAGS
+				"${UNIX_FLAGS}")
+	endif(BUILD_CLIENT)
+
+	if(BUILD_SERVER)
+		set_target_properties(minetestserver PROPERTIES COMPILE_FLAGS
+				"${UNIX_FLAGS} -DSERVER")
+	endif(BUILD_SERVER)
+
+else( UNIX )
+	# Windows
+	
+	if(BUILD_CLIENT)
+		# EHa enables SEH exceptions (used for catching segfaults)
+		set_target_properties(minetest PROPERTIES COMPILE_FLAGS
+				"/O2 /Ob2 /Oi /Ot /Oy /GL /EHa")
+	endif(BUILD_CLIENT)
+
+	if(BUILD_SERVER)
+		# EHa enables SEH exceptions (used for catching segfaults)
+		set_target_properties(minetestserver PROPERTIES COMPILE_FLAGS
+				"/O2 /Ob2 /Oi /Ot /Oy /GL /EHa /D SERVER")
+	endif(BUILD_SERVER)
+
+endif( UNIX )
+
+#
+# Installation
+#
+
+if(WIN32)
+	set(DATADIR "data")
+	set(BINDIR "bin")
+elseif(APPLE)
+	set(DATADIR "share/minetest")
+	set(BINDIR "bin")
+elseif(UNIX)
+	set(DATADIR "share/minetest")
+	set(BINDIR "bin")
+endif()
+
+if(BUILD_CLIENT)
+	install(TARGETS minetest DESTINATION ${BINDIR})
+
+	file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/*.png")
+
+	install(FILES ${images} DESTINATION ${DATADIR})
+
+	if(WIN32)
+		if(DEFINED IRRLICHT_DLL)
+			install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
+		endif()
+		if(DEFINED ZLIB_DLL)
+			install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
+		endif()
+	endif()
+endif(BUILD_CLIENT)
+
+if(BUILD_SERVER)
+	install(TARGETS minetestserver DESTINATION ${BINDIR})
+endif(BUILD_SERVER)
+
+# Subdirectories
 
 add_subdirectory(jthread)
 
-#END
+#end