From e95f8ac5a3c485f33fe58b541c822c0a4621e5a5 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Fri, 11 Dec 2015 20:21:56 +0100
Subject: [PATCH] Merge with develop

---
 code/nel/include/nel/misc/dynloadlib.h    |  3 +-
 code/nel/include/nel/net/module_manager.h |  2 +-
 code/nel/src/misc/dynloadlib.cpp          |  3 ++
 code/ryzom/client/macosx/Info.plist       | 36 +++++++++++++----------
 code/ryzom/client/src/CMakeLists.txt      | 10 ++++++-
 5 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/code/nel/include/nel/misc/dynloadlib.h b/code/nel/include/nel/misc/dynloadlib.h
index a42dbf067..63719f423 100644
--- a/code/nel/include/nel/misc/dynloadlib.h
+++ b/code/nel/include/nel/misc/dynloadlib.h
@@ -174,7 +174,8 @@ public:
 
 	/** Build a NeL standard library name according to platform and compilation mode setting.
 	 *	aka : adding decoration one base lib name.
-	 *	e.g : 'mylib' become	'mylib_rd.dll' on Windows ReleaseDebug mode or
+	 *	e.g : 'mylib' become	'mylib_rd.dll' on Windows ReleaseDebug mode,
+	 *							'libmylib.dylib' under OS X or
 	 *							'libmylib.so' on unix system.
 	 */
 	static std::string makeLibName(const std::string &baseName);
diff --git a/code/nel/include/nel/net/module_manager.h b/code/nel/include/nel/net/module_manager.h
index e4c23f8b6..92f947f74 100644
--- a/code/nel/include/nel/net/module_manager.h
+++ b/code/nel/include/nel/net/module_manager.h
@@ -70,7 +70,7 @@ namespace NLNET
 		 *
 		 *	The library name is the base name that will be 'decorated'
 		 *	with the nel naming standard according to compilation mode
-		 *	and platform specific file extension (.dll or .so).
+		 *	and platform specific file extension (.dll, .dylib or .so).
 		 *
 		 *	A module library can only be loaded once. If the library
 		 *	is already loaded, the call is ingored.
diff --git a/code/nel/src/misc/dynloadlib.cpp b/code/nel/src/misc/dynloadlib.cpp
index 25f28286e..0b456f166 100644
--- a/code/nel/src/misc/dynloadlib.cpp
+++ b/code/nel/src/misc/dynloadlib.cpp
@@ -71,6 +71,9 @@ void *nlGetSymbolAddress(NL_LIB_HANDLE libHandle, const std::string &procName)
 #ifdef NL_OS_WINDOWS
   const string	nlLibPrefix;	// empty
   const string	nlLibExt(".dll");
+#elif defined(NL_OS_MAC)
+  const string	nlLibPrefix("lib");
+  const string	nlLibExt(".dylib");
 #elif defined(NL_OS_UNIX)
   const string	nlLibPrefix("lib");
   const string	nlLibExt(".so");
diff --git a/code/ryzom/client/macosx/Info.plist b/code/ryzom/client/macosx/Info.plist
index 199996f07..9bb1fdbe0 100644
--- a/code/ryzom/client/macosx/Info.plist
+++ b/code/ryzom/client/macosx/Info.plist
@@ -14,6 +14,14 @@
 	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>en</string>
+		<string>fr</string>
+		<string>de</string>
+		<string>ru</string>
+		<string>es</string>
+	</array>
 	<key>CFBundleLongVersionString</key>
 	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
 	<key>CFBundleName</key>
@@ -24,27 +32,23 @@
 	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
-	<key>LSFileQuarantineEnabled</key>
-	<true/>
 	<key>CSResourcesFileMapped</key>
 	<true/>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>CFBundleLocalizations</key>
-	<array>
-		<string>en</string>
-		<string>fr</string>
-		<string>de</string>
-		<string>ru</string>
-		<string>es</string>
-	</array>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.role-playing-games</string>
+	<key>LSFileQuarantineEnabled</key>
+	<true/>
+	<key>LSMinimumSystemVersion</key>
+	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
 </dict>
 </plist>
diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt
index fb8d6c8e7..8ddab0cc9 100644
--- a/code/ryzom/client/src/CMakeLists.txt
+++ b/code/ryzom/client/src/CMakeLists.txt
@@ -118,7 +118,15 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS
 NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Client")
 NL_ADD_RUNTIME_FLAGS(ryzom_client)
 
-NL_ADD_LIB_SUFFIX(ryzom_client)
+IF(FINAL_VERSION)
+  NL_ADD_LIB_SUFFIX(ryzom_client)
+ELSE()
+  IF(WIN32)
+    SET_TARGET_PROPERTIES(ryzom_client PROPERTIES DEBUG_POSTFIX "_dev_d" RELEASE_POSTFIX "_dev_r")
+  ELSE()
+    SET_TARGET_PROPERTIES(ryzom_client PROPERTIES POSTFIX "_dev")
+  ENDIF()
+ENDIF()
 
 IF(WITH_RYZOM_CLIENT_UAC)
   IF(CMAKE_GENERATOR MATCHES "Visual Studio")