merge 0.9.15 with default
authornemo
Sun, 26 Dec 2010 15:28:44 -0500
changeset 4702 8d58de712738
parent 4697 c27bea52efac (diff)
parent 4700 e8fd20b2d66b (current diff)
child 4703 58d926024040
merge 0.9.15 with default
CMakeLists.txt
--- a/CMakeLists.txt	Sun Dec 26 12:42:22 2010 -0500
+++ b/CMakeLists.txt	Sun Dec 26 15:28:44 2010 -0500
@@ -8,7 +8,7 @@
 ENDIF()
 
 #detect Mercurial revision (if present)
-#set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
+set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
 IF(version_suffix MATCHES "-dev")
 	set(HW_DEV true)
 	IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.hg)
@@ -165,7 +165,7 @@
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(HEDGEWARS_PROTO_VER 37)
+set(HEDGEWARS_PROTO_VER 34)
 
 if(WITH_SERVER)
 	message(STATUS "Server is going to be built! Make sure you have GHC installed")
@@ -239,13 +239,14 @@
 	"release$"
 	"Debug$"
 	"Release$"
-	"proto.inc$"
-	"hwconsts.cpp$"
-	"playlist.inc$"
+	"proto\\\\.inc$"
+	"hwconsts\\\\.cpp$"
+	"playlist\\\\.inc$"
 	"CPack"
-	"cmake_install.cmake$"
-	"config.inc$"
-	"hwengine.desktop$"
+	"cmake_install\\\\.cmake$"
+	"config\\\\.inc$"
+	"hwengine\\\\.desktop$"
+	"CMakeCache\\\\.txt$"
 #   "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libopenalbridge"
 	"^${CMAKE_CURRENT_SOURCE_DIR}/project_files/HedgewarsMobile/"
 	"^${CMAKE_CURRENT_SOURCE_DIR}/bin/[a-z]"