From 37d36e0ab5f7127cff277e0c60268bbdc0c2353f Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Thu, 30 Jan 2014 14:43:51 +0100
Subject: [PATCH] Fixed: Compilation under Mac OS X 10.9

---
 code/CMakeModules/nel.cmake          | 8 ++++++--
 code/nel/include/nel/misc/variable.h | 4 ++--
 code/ryzom/client/src/CMakeLists.txt | 4 ----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index c75e2e580..ad6fbb2ae 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -786,11 +786,15 @@ MACRO(NL_SETUP_BUILD)
 
             ADD_PLATFORM_FLAGS("${XARCH}-isysroot${CMAKE_IOS_SIMULATOR_SYSROOT}")
             ADD_PLATFORM_FLAGS("${XARCH}-mios-simulator-version-min=${IOS_VERSION}")
-            SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} ${XARCH}-Wl,-macosx_version_min,${CMAKE_OSX_DEPLOYMENT_TARGET}")
+            IF(CMAKE_OSX_DEPLOYMENT_TARGET)
+              SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} ${XARCH}-Wl,-macosx_version_min,${CMAKE_OSX_DEPLOYMENT_TARGET}")
+            ENDIF(CMAKE_OSX_DEPLOYMENT_TARGET)
           ENDIF(CMAKE_IOS_SIMULATOR_SYSROOT AND TARGET_X86)
         ELSE(IOS)
           # Always force -mmacosx-version-min to override environement variable
-          SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-macosx_version_min,${CMAKE_OSX_DEPLOYMENT_TARGET}")
+          IF(CMAKE_OSX_DEPLOYMENT_TARGET)
+            SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-macosx_version_min,${CMAKE_OSX_DEPLOYMENT_TARGET}")
+          ENDIF(CMAKE_OSX_DEPLOYMENT_TARGET)
         ENDIF(IOS)
 
         SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-headerpad_max_install_names")
diff --git a/code/nel/include/nel/misc/variable.h b/code/nel/include/nel/misc/variable.h
index 80528a928..fa4ccd19c 100644
--- a/code/nel/include/nel/misc/variable.h
+++ b/code/nel/include/nel/misc/variable.h
@@ -316,14 +316,14 @@ public:
 				// output the oldest part of the buffer first
 				for (uint i=_Mean.getCurrentFrame(); i<_Mean.getNumFrame(); ++i)
 				{
-					str << _Mean.getLastFrames()[i];
+					str << (T)_Mean.getLastFrames()[i];
 					if (i < _Mean.getNumFrame()-1 || _Mean.getCurrentFrame() != 0)
 						str << ",";
 				}
 				// then output the newest part
 				for (uint i = 0; i < _Mean.getCurrentFrame(); i++)
 				{
-					str << _Mean.getLastFrames()[i];
+					str << (T)_Mean.getLastFrames()[i];
 					if (i < _Mean.getCurrentFrame()-1)
 						str << ",";
 				}
diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt
index 6a08a5e76..324735ff8 100644
--- a/code/ryzom/client/src/CMakeLists.txt
+++ b/code/ryzom/client/src/CMakeLists.txt
@@ -47,10 +47,6 @@ SOURCE_GROUP("r2" FILES ${SRC_R2})
 
 # on Mac, create a .App Bundle
 if(APPLE)
-  IF(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-    SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.6")
-  ENDIF(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-
   SET(MACOSX_BUNDLE_INFO_STRING "Ryzom Core Client")
   SET(MACOSX_BUNDLE_ICON_FILE "ryzom.icns")
   SET(MACOSX_BUNDLE_GUI_IDENTIFIER "")