summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-07-31 00:51:18 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-07-31 00:51:18 +0300
commit149875607ca926e99bdc6c855e56aba8569bb1a9 (patch)
treea3fdedee4e7c6b1cdbfe0d30dd4850c828a4bccd
parent05d0eaf5fc4947081ae743a58e8675991e3f2422 (diff)
downloadminetest-149875607ca926e99bdc6c855e56aba8569bb1a9.tar.gz
minetest-149875607ca926e99bdc6c855e56aba8569bb1a9.tar.bz2
minetest-149875607ca926e99bdc6c855e56aba8569bb1a9.zip
updated CMakeList.txts a bit
-rw-r--r--CMakeLists.txt7
-rw-r--r--src/CMakeLists.txt2
2 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc6f45a59..514175e9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,11 @@ else()
endif()
set(BUILD_CLIENT 1 CACHE BOOL "Build client")
-set(BUILD_SERVER 1 CACHE BOOL "Build server")
+if(WIN32)
+ set(BUILD_SERVER 0 CACHE BOOL "Build server")
+else()
+ set(BUILD_SERVER 1 CACHE BOOL "Build server")
+endif()
set(WARN_ALL 1 CACHE BOOL "Enable -Wall for Release build")
@@ -60,6 +64,7 @@ elseif(UNIX) # Linux, BSD etc
endif()
install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
+install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
#
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9bb266784..4d51f7104 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -130,7 +130,7 @@ set(common_SRCS
# This gives us the icon
if(WIN32 AND MSVC)
- set(common_SRCS ${common_SRCS} winresource.rc)
+ set(common_SRCS ${common_SRCS} winresource.rc)
endif()
# Client sources