From b27b2a08171869ea3c7a2a6b790a392a2c8429e9 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Fri, 9 Mar 2012 13:03:47 +0100
Subject: [PATCH 1/2] Changed: #1433 Merge changes from patch 1.13 (patch
 provided by Molator)

---
 code/ryzom/client/src/login.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp
index e43d6c8f5..157a97f8a 100644
--- a/code/ryzom/client/src/login.cpp
+++ b/code/ryzom/client/src/login.cpp
@@ -1794,6 +1794,7 @@ class CAHOpenURL : public IActionHandler
 		}
 		else
 		{
+			DWORD ret = 0;
 			LPVOID lpMsgBuf;
 			FormatMessage(
 				FORMAT_MESSAGE_ALLOCATE_BUFFER |

From b97eabc992f30ee059489f3d67c95bd530164fd0 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Fri, 9 Mar 2012 14:39:37 +0100
Subject: [PATCH 2/2] Fixed: Compilation with WITH_STATIC_EXTERNAL under Mac OS
 X

---
 code/CMakeModules/FindFreeType.cmake | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/CMakeModules/FindFreeType.cmake b/code/CMakeModules/FindFreeType.cmake
index b9d00d96a..4f3c84cbe 100644
--- a/code/CMakeModules/FindFreeType.cmake
+++ b/code/CMakeModules/FindFreeType.cmake
@@ -57,6 +57,13 @@ FIND_LIBRARY(FREETYPE_LIBRARY
 
 IF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)
   SET(FREETYPE_FOUND "YES")
+  IF(WITH_STATIC_EXTERNAL AND APPLE)
+    FIND_PACKAGE(BZip2)
+    IF(BZIP2_FOUND)
+      SET(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
+      SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARY} ${BZIP2_LIBRARIES})
+    ENDIF(BZIP2_FOUND)
+  ENDIF(WITH_STATIC_EXTERNAL AND APPLE)
   IF(NOT FREETYPE_FIND_QUIETLY)
     MESSAGE(STATUS "Found FreeType: ${FREETYPE_LIBRARY}")
   ENDIF(NOT FREETYPE_FIND_QUIETLY)