From ba1488ec972d7abfc5cda14e2f0d90437c10fa91 Mon Sep 17 00:00:00 2001
From: Marco Antognini <antognini.marco@gmail.com>
Date: Tue, 7 Oct 2014 10:46:05 +0200
Subject: [PATCH 1/2] Improve flexibility of dependencies locations on OS X

 - Replaced @executable_path by @rpath for more flexibility
 - Updated freetype and sndfile libs as follow:

    install_name_tool -id "@rpath/../Frameworks/freetype.framework/Versions/A/freetype" freetype
    install_name_tool -id "@rpath/../Frameworks/sndfile.framework/Versions/A/sndfile" sndfile
---
 CMakeLists.txt                                |   2 +-
 cmake/Macros.cmake                            |   2 +-
 .../freetype.framework/Versions/A/freetype    | Bin 1668068 -> 1668068 bytes
 .../sndfile.framework/Versions/A/sndfile      | Bin 6602736 -> 6602736 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 969779f0..011625aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,7 +232,7 @@ else()
     # NOTE: it's not required to link agains SFML.framework
     set_target_properties(SFML PROPERTIES
                           BUILD_WITH_INSTALL_RPATH 1
-                          INSTALL_NAME_DIR "@executable_path/../Frameworks")
+                          INSTALL_NAME_DIR "@rpath")
 
     # install rule
     install(TARGETS SFML
diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
index 5e09a3cb..01a1f1da 100644
--- a/cmake/Macros.cmake
+++ b/cmake/Macros.cmake
@@ -84,7 +84,7 @@ macro(sfml_add_library target)
         # adapt install directory to allow distributing dylibs/frameworks in user’s frameworks/application bundle
         set_target_properties(${target} PROPERTIES
                               BUILD_WITH_INSTALL_RPATH 1
-                              INSTALL_NAME_DIR "@executable_path/../Frameworks")
+                              INSTALL_NAME_DIR "@rpath")
     endif()
 
     # enable automatic reference counting on iOS
diff --git a/extlibs/libs-osx/Frameworks/freetype.framework/Versions/A/freetype b/extlibs/libs-osx/Frameworks/freetype.framework/Versions/A/freetype
index 5a62814ac97a729d8d5408fcd9200cc75b5fe3b1..831e8c418666ad978fa901649742613893518d02 100755
GIT binary patch
delta 202
zcmZw9Ar8VY00qz%3T$*h2W?qREeS^;h#q2sklFcW3XhmxFdSeBmSmz=;Q&i!Fx-G2
zG~(IU4`n};PbuiTQ)0(-P6)|>0wL*-t8Rrnba(lR8<$+Yt-Yl%f-x|dz!YW>K^(lD
uw;y^5O7I8MCrp3eW6+B4S>vMG84d|7U<oS_kir@^AVGnKEo8wN)1JQrqA;oe

delta 218
zcmaFzJoU-*)D0p6j6XJu3aGOvBrq^ANB}V-5Hm0cg0VwtMQU<sNn%n?YW(y|BHT8c
zdqi$<HW$dX7sxRJF%u9o12GE_vjQ<25VHd@2M}{^FOcI}@{zG&yQl#7aw5&&E+ERS
x!P4#^$qmFjK+Frod_c?(!~#Gp2*g4_EDXdVKr9NxVn8eo#1h*bBqf(b0RRL;I7R>f

diff --git a/extlibs/libs-osx/Frameworks/sndfile.framework/Versions/A/sndfile b/extlibs/libs-osx/Frameworks/sndfile.framework/Versions/A/sndfile
index 97defcc6a916b954be11db2367b544486f7f2aeb..f71a8532b80266c32c2e7a4eae983a8330b13a7e 100755
GIT binary patch
delta 506
zcmZY4$uh%m0LSqpjjE;kM-oA7u{5ZCuhLNa8WgqHG9JJyIMkIf;{n{9%=D0pqX+Q<
zW_okv+q1*xcm90~zfXYz-ZddV<aH5MjkF|5CS*va!YGn^_Y%{cc>Y=Y2tT@^d(X~!
zwhRRUs3<`Yr3j%6<)}a<!l*(70@bKNEi~vbPzMwBXh0(@G@%(SXhj=}KibiOPIUR6
z9sT^4v%W5zAJxbd8}L6S;os`cTacQZupD%w2fc`)5B(UxAcioE5sYFC<CwrCrVz(8
z5}3g(l5jDHd8Dv_MJ!<%D_F%E*0F(2Y+)N7cCd>*q_K|!93q1w9ODG1IKw$Eki{jg
LaP150=IiwjmsNe9

delta 519
zcmZ|KxiSL*0LJm%&5AQDc3A{#9a;BH5X616;wEI1*cpYA8NDKn!ccesjnYhtZIm9w
z3z$i#<evvn{J#48=YF4jIlQZi_?Xp{kZi;SLC_&W&?QC^qVAoWzP(ANuHD3QOburr
z)Q`ZuZDwp!gajXC6u^%{6rmU;C`B0pC`SbpRH6#iP@$m)wa`(AdNd%2Ml_)r23nB+
z(TX;-qr<b!(C4>!<!OrbBO6Y>1pg(yn3@&w9L;+3XOy6YPIRFgJ?KRr`Z0h(3}F}}
z7{wUI5yk{2F@*@GF@sq|F^739U=d4L#tK%khIMRU6I<BE4s7fqhCS@#0EaljF-~xb
VGsJO@3nbtmi4@YF61@C+{R7Z<gc|?=


From 9a8ba74c62717d3c73dd07c4cff85a776d6bc0b9 Mon Sep 17 00:00:00 2001
From: Marco Antognini <antognini.marco@gmail.com>
Date: Tue, 7 Oct 2014 10:58:39 +0200
Subject: [PATCH 2/2] Updated Xcode templates

Since the @loader_path was replaced with @rpath, to correctly load
binaries from within a bundle app we need to add the Frameworks
subdirectory to the run path list.
---
 .../templates/SFML/SFML Bundle.xctemplate/TemplateInfo.plist   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/xcode/templates/SFML/SFML Bundle.xctemplate/TemplateInfo.plist b/tools/xcode/templates/SFML/SFML Bundle.xctemplate/TemplateInfo.plist
index b3c3560a..fa13061d 100644
--- a/tools/xcode/templates/SFML/SFML Bundle.xctemplate/TemplateInfo.plist	
+++ b/tools/xcode/templates/SFML/SFML Bundle.xctemplate/TemplateInfo.plist	
@@ -127,6 +127,9 @@ subject to the following restrictions:
                 <dict>
                     <key>INFOPLIST_FILE</key>
                     <string>___PACKAGENAME___/___PACKAGENAME___-Info.plist</string>
+
+                    <key>LD_RUNPATH_SEARCH_PATHS</key>
+                    <string>@loader_path/../Frameworks</string>
                 </dict>
             </dict>
         </array>