Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and content_mapblock.{h...

[dragonfireclient.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0dc4728d57e3b78553ca7157fbd26f70cd97393e..9cb6db41f112d44a5860d9596d3e22a9141971b5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,8 +8,8 @@ endif(${CMAKE_VERSION} STREQUAL "2.8.2")
 project(minetest)
 
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 0)
-set(VERSION_PATCH 1)
+set(VERSION_MINOR 2)
+set(VERSION_PATCH 20110602_1_dev)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Configuration options
@@ -45,15 +45,18 @@ if(WIN32)
        set(DATADIR "data")
        set(BINDIR "bin")
        set(DOCDIR "doc")
+       set(EXAMPLE_CONF_DIR ".")
 elseif(APPLE)
        # random placeholders
        set(DATADIR "share/minetest")
        set(BINDIR "bin")
        set(DOCDIR "share/doc/minetest")
-elseif(UNIX)
-       set(DATADIR "/usr/share/minetest")
-       set(BINDIR "/usr/bin")
-       set(DOCDIR "/usr/share/doc/minetest")
+       set(EXAMPLE_CONF_DIR ".")
+elseif(UNIX) # Linux, BSD etc
+       set(DATADIR "share/minetest")
+       set(BINDIR "bin")
+       set(DOCDIR "share/doc/minetest")
+       set(EXAMPLE_CONF_DIR "share/doc/minetest")
 endif()
 
 install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
@@ -77,12 +80,13 @@ set(CPACK_PACKAGE_CONTACT "Perttu Ahola <celeron55@gmail.com>")
 
 if(WIN32)
        # For some reason these aren't copied otherwise
-       if(BUILD_CLIENT)
-               install(FILES bin/minetest.exe DESTINATION bin)
-       endif()
-       if(BUILD_SERVER)
-               install(FILES bin/minetestserver.exe DESTINATION bin)
-       endif()
+       # NOTE: For some reason now it seems to work without these
+       #if(BUILD_CLIENT)
+       #       install(FILES bin/minetest.exe DESTINATION bin)
+       #endif()
+       #if(BUILD_SERVER)
+       #       install(FILES bin/minetestserver.exe DESTINATION bin)
+       #endif()
 
        set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32")