Merge with develop

--HG--
branch : compatibility-develop

code/CMakeLists.txt

@@ -168,7 +168,11 @@ IF(WITH_SSE2)
   ENDIF()
 ENDIF()
 
-IF(APPLE_CERTIFICATE)
+IF(APPLE)
+  FIND_LIBRARY(CARBON_FRAMEWORK Carbon)
+  FIND_LIBRARY(FOUNDATION_FRAMEWORK Foundation)
+
+  IF(APPLE_CERTIFICATE)
     # Find codesign_allocate
 
     # Xcode 7.0 and later versions
@@ -188,6 +192,7 @@ IF(APPLE_CERTIFICATE)
       MESSAGE(WARNING "Unable to find codesign_allocate in standard directories")
       SET(CODESIGN_ALLOCATE)
     ENDIF()
+  ENDIF()
 ENDIF()
 
 MACRO(ADD_QT_LIBRARY _NAME)
@@ -382,8 +387,6 @@ IF(WITH_QT5)
       IF(APPLE)
         FIND_LIBRARY(PCRE_LIBRARY pcre16 pcre)
 
-        FIND_LIBRARY(FOUNDATION_FRAMEWORK Foundation)
-        FIND_LIBRARY(CARBON_FRAMEWORK Carbon)
         FIND_LIBRARY(SECURITY_FRAMEWORK Security)
 
         SET(QT_LIBRARIES ${QT_LIBRARIES}

code/CMakeModules/OSXToolChain.cmake

@@ -1,7 +1,7 @@
 # Define OSX_SDK to force a specific version such as : -DOSX_SDK=10.11
 #
 # Example:
-# cmake .. -DCMAKE_TOOLCHAIN_FILE=../CMakeModules/OSXToolChain.cmake -DWITH_NEL_TESTS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TOOLS=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LUA51=OFF -DWITH_LUA53=ON -DCMAKE_BUILD_TYPE=Release -DWITH_RYZOM_INSTALLER=OFF -DWITH_RYZOM_PATCH=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_TOOLS=OFF -DWITH_TOOLS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_WARNINGS=OFF -DWITH_QT5=OFF -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON -DWITH_STATIC_EXTERNAL=ON -DWITH_UNIX_STRUCTURE=OFF -DWITH_INSTALL_LIBRARIES=OFF -DWITH_RYZOM_SANDBOX=OFF -DOSX_SDK=10.11
+# cmake ../code -DCMAKE_TOOLCHAIN_FILE=../code/CMakeModules/OSXToolChain.cmake -DWITH_SYMBOLS=ON -DWITH_NEL_TESTS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_NEL_TOOLS=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LUA51=OFF -DWITH_LUA53=ON -DCMAKE_BUILD_TYPE=Release -DWITH_RYZOM_INSTALLER=OFF -DWITH_RYZOM_PATCH=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_TOOLS=OFF -DWITH_TOOLS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_WARNINGS=OFF -DWITH_QT5=OFF -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON -DWITH_STATIC_EXTERNAL=ON -DWITH_UNIX_STRUCTURE=OFF -DWITH_INSTALL_LIBRARIES=OFF -DWITH_RYZOM_SANDBOX=OFF -DOSX_SDK=10.11
 
 # Don't forget to define environment variables:
 #
@@ -9,8 +9,14 @@
 # export OSXCROSS_GCC_NO_STATIC_RUNTIME=1
 # export PATH=$PATH:/home/src/osxcross/target/bin
 #
+# ln -s /usr/bin/hg /home/src/osxcross/target/bin/hg
+#
 # To install all dependencies:
-# ./osxcross-macports install libxml2 jpeg curl libogg libvorbis freetype boost openssl zlib lua-5.3
+# ./osxcross-macports install libxml2 jpeg curl libogg libvorbis freetype boost openssl zlib lua-5.3 giflib
+
+# to compile Luabind
+# export CMAKE_MODULE_PATH=$HOME/shard/tools/external/cmake/modules
+# cmake .. -DCMAKE_TOOLCHAIN_FILE=$HOME/ryzomcore/code/CMakeModules/OSXToolChain.cmake -DWITH_SHARED=OFF -DWITH_STATIC=ON -DWITH_LUA51=OFF -DWITH_LUA53=ON -DCMAKE_INSTALL_PREFIX=$HOME/osxcross/target/external
 
 IF(DEFINED CMAKE_CROSSCOMPILING)
   # subsequent toolchain loading is not really needed

code/nel/src/misc/CMakeLists.txt

@@ -202,7 +202,9 @@ ENDIF()
 
 IF(UNIX)
   TARGET_LINK_LIBRARIES(nelmisc -lc -ldl)
-  IF(NOT APPLE)
+  IF(APPLE)
+    TARGET_LINK_LIBRARIES(nelmisc ${CARBON_FRAMEWORK})
+  ELSE()
     TARGET_LINK_LIBRARIES(nelmisc -lrt)
   ENDIF()
 ENDIF()

code/ryzom/client/src/CMakeLists.txt

@@ -186,8 +186,7 @@ IF(WITH_RYZOM_CLIENT)
   ENDIF()
 
   IF(APPLE)
-    FIND_LIBRARY(FOUNDATION_LIBRARY Foundation)
+    TARGET_LINK_LIBRARIES(ryzom_client ${FOUNDATION_FRAMEWORK})
-    TARGET_LINK_LIBRARIES(ryzom_client ${FOUNDATION_LIBRARY})
   ENDIF()
 
   ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS})

code/ryzom/tools/client/client_patcher/CMakeLists.txt

@@ -27,8 +27,7 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher
 				${CURL_LIBRARIES})
 
 IF(APPLE)
-  FIND_LIBRARY(FOUNDATION_LIBRARY Foundation)
+  TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_FRAMEWORK})
-  TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY})
 ENDIF()
 
 ADD_DEFINITIONS(${CURL_DEFINITIONS})