From 9172b10b4a33f24a56f1672c8577bbbba271d675 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 21 Aug 2008 07:02:23 +0000
Subject: Correction X11 path for standalone app for Mac OS X 10.4. Works on
 10.5, too.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1283 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Makefile.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Game/Code/Makefile.in b/Game/Code/Makefile.in
index 0ceee585..8fc31bd8 100644
--- a/Game/Code/Makefile.in
+++ b/Game/Code/Makefile.in
@@ -319,7 +319,7 @@ endef
 	$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libSDL_image.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
 
 # X11 libs as well, because users may not have installed it on 10.4
-	$(foreach dylib,$(shell $(OTOOL) -L /usr/X11/lib/libX11.dylib  | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+	$(foreach dylib,$(shell $(OTOOL) -L /usr/X11R6/lib/libX11.dylib  | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
 
 # final messages
 	@echo "Standalone Mac OS X application created."
@@ -329,6 +329,8 @@ macosx-disk-image: macosx-standalone-app
 	/bin/rm -f ultrastardx.dmg
 	$(HDIUTIL) create -type SPARSE -size 30m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
 	/bin/cp -R ../../UltraStarDeluxe.app /Volumes/UltraStarDeluxe
+#	/bin/cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns
+#	/Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe
 	$(HDIUTIL) detach /Volumes/UltraStarDeluxe
 	$(HDIUTIL) convert UltraStarDeluxe.sparseimage -format UDBZ -o ultrastardx.dmg
 	/bin/rm -f  UltraStarDeluxe.sparseimage
-- 
cgit v1.2.3