merge default with .19
authorkoda
Mon, 03 Jun 2013 10:05:44 +0200
changeset 9098 cba0d2199123
parent 9094 2cdb0ed3813a (current diff)
parent 9097 4ae3dd71f5fa (diff)
child 9100 3f5e0280db4d
merge default with .19
CMakeLists.txt
--- a/.hgtags	Fri May 31 14:51:08 2013 -0400
+++ b/.hgtags	Mon Jun 03 10:05:44 2013 +0200
@@ -59,3 +59,4 @@
 0000000000000000000000000000000000000000 0.9.18-release
 0000000000000000000000000000000000000000 0.9.18-release
 2fc02902c7cbf3c29bfe08a50e5f37983582b251 0.9.18-release
+1617149e01a4fa25637e2ab655d0287ef9c21b7c 0.9.19-release
--- a/CMakeLists.txt	Fri May 31 14:51:08 2013 -0400
+++ b/CMakeLists.txt	Mon Jun 03 10:05:44 2013 +0200
@@ -24,7 +24,7 @@
 option(NOVIDEOREC "Disable video recording (off)" OFF)
 
 #set this to ON when 2.1.0 becomes more widespread (and only for linux)
-option(SYSTEM_PHYSFS "Use system physfs (off)" OFF)
+option(PHYSFS_SYSTEM "Use system physfs (off)" OFF)
 
 option(BUILD_ENGINE_LIBRARY "Enable hwengine library (off)" OFF)
 option(ANDROID "Enable Android build (off)" OFF)
@@ -315,7 +315,7 @@
 
 
 #physfs discovery
-if (${SYSTEM_PHYSFS})
+if (${PHYSFS_SYSTEM})
     if (NOT PHYSFS_LIBRARY OR NOT PHYSFS_INCLUDE_DIR)
         find_package(PhysFS)
     endif()