OSX: make the app bundle run without fink installed, by copying all required libraries into the install directory

git-svn-id: svn://svn.icculus.org/netradiant/trunk@203 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-03-04 08:51:00 +00:00
parent 03c2a5a99f
commit 64eee327a3
7 changed files with 278 additions and 2 deletions

View File

@ -24,6 +24,7 @@ CXX ?= g++
RANLIB ?= ranlib
AR ?= ar
LDD ?= ldd # nothing on Win32
OTOOL ?= # only used on OS X
WINDRES ?= windres # only used on Win32
PKGCONFIG ?= pkg-config
@ -195,6 +196,7 @@ ifeq ($(OS),Darwin)
LIBS_GTKGLEXT += -lX11 -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
# workaround: we have no "ldd" for OS X, so...
LDD =
OTOOL = otool
INSTALLDIR := $(INSTALLDIR_BASE)/NetRadiant.app/Contents/MacOS/install
else
@ -266,7 +268,8 @@ dependencies-check:
checkbinary binutils "$(AR)"; \
checkbinary pkg-config "$(PKGCONFIG)"; \
[ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \
[ -n "$(lDD)" ] && checkbinary libc6 "$(LDD)"; \
[ -n "$(LDD)" ] && checkbinary libc6 "$(LDD)"; \
[ -n "$(OTOOL)" ] && checkbinary xcode "$(OTOOL)"; \
$(ECHO) All required tools have been found!
@$(ECHO)
@if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \
@ -965,8 +968,13 @@ ifeq ($(OS),Win32)
install-dll: binaries
MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dlls.sh
else
ifeq ($(OS),Darwin)
install-dll: binaries
CP="$(CP)" OTOOL="$(OTOOL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dylibs.sh
else
install-dll: binaries
@$(ECHO) No DLL inclusion implemented for this target.
endif
endif
-include $(shell find . -name \*.d)

22
install-dylibs.sh Normal file
View File

@ -0,0 +1,22 @@
#!/bin/sh
set -ex
: ${OTOOL:=otool}
: ${CP:=cp}
: ${INSTALLDIR:=.}
finkgetdeps()
{
otool -L "$1" | grep /sw/lib | while read -r LIB STUFF; do
[ -f "$INSTALLDIR/${LIB##*/}" ] && continue
cp -vL "$LIB" "$INSTALLDIR"
finkgetdeps "$INSTALLDIR/${LIB##*/}"
done
}
finkgetdeps "$INSTALLDIR/radiant.ppc"
echo Warning: this only works if only ONE version of gtk-2.0 and pango is installed
cp -vL /sw/lib/gtk-2.0/*/loaders/libpixbufloader-bmp.so "$INSTALLDIR/"
cp -vL /sw/lib/pango/*/modules/pango-basic-fc.so "$INSTALLDIR/"
cp -vL /sw/lib/pango/*/modules/pango-basic-x.so "$INSTALLDIR/"

View File

@ -0,0 +1,12 @@
# GdkPixbuf Image Loader Modules file
# Automatically generated file, do not edit
# Created by gdk-pixbuf-query-loaders from gtk+-2.6.10
#
# LoaderDir = /sw.haha/lib/gtk-2.0/2.4.0/loaders
#
"./libpixbufloader-bmp.so"
"bmp" 5 "gtk20" "The BMP image format"
"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
"bmp" ""
"BM" "" 100

View File

@ -4,7 +4,9 @@ MY_DIRECTORY="${0%/*}" # cut off the script name
MY_DIRECTORY="${MY_DIRECTORY%/*}" # cut off MacOS
MY_DIRECTORY="${MY_DIRECTORY%/*}" # cut off Contents
#export DYLD_LIBRARY_PATH="$MY_DIRECTORY/Contents/MacOS"
export DYLD_LIBRARY_PATH="$MY_DIRECTORY/Contents/MacOS/install"
export PANGO_RC_FILE="$MY_DIRECTORY/Contents/MacOS/pangorc"
export GDK_PIXBUF_MODULE_FILE="$MY_DIRECTORY/Contents/MacOS/gdk-pixbuf.loaders"
cd "$MY_DIRECTORY/Contents/MacOS/install"

View File

@ -0,0 +1,7 @@
# Pango Modules file
# Automatically generated file, do not edit
#
# ModulesPath = /sw.haha/lib/pango/1.4.0/modules
#
./pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc armenian:* bopomofo:* cherokee:* coptic:* cyrillic:* deseret:* ethiopic:* georgian:* gothic:* greek:* han:* hiragana:* katakana:* latin:* ogham:* old-italic:* runic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* common:
./pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common:

View File

@ -0,0 +1,5 @@
[Pango]
ModuleFiles = ../pango.modules
[PangoX]
AliasFiles = ../pangox.aliases

View File

@ -0,0 +1,220 @@
# File defining aliases of PangoFontDescription to X font set
#
# family style variant weight stretch XLFD
sans normal normal normal normal \
"-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,\
-*-gulim-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
sans italic normal normal normal \
"-*-helvetica-medium-o-normal--*-*-*-*-*-*-*-*,\
-*-gulim-medium-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
sans normal normal bold normal \
"-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*,\
-*-gulim-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
sans italic normal bold normal \
"-*-helvetica-bold-o-normal--*-*-*-*-*-*-*-*,\
-*-gulim-bold-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
serif normal normal normal normal \
"-*-times-medium-r-normal--*-*-*-*-*-*-*-*,\
-*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
serif italic normal normal normal \
"-*-times-medium-i-normal--*-*-*-*-*-*-*-*,\
-*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
serif normal normal bold normal \
"-*-times-bold-r-normal--*-*-*-*-*-*-*-*,\
-*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
serif italic normal bold normal \
"-*-times-bold-i-normal--*-*-*-*-*-*-*-*,\
-*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
monospace normal normal normal normal \
"-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
monospace italic normal normal normal \
"-*-fixed-medium-i-normal--*-*-*-*-*-*-*-*,\
-*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
monospace normal normal bold normal \
"-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*,\
-*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"
monospace italic normal bold normal \
"-*-fixed-bold-i-normal--*-*-*-*-*-*-*-*,\
-*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
-*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
-kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
-*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\
-freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\
-*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\
-*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\
-*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\
-*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\
-*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\
-*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\
-*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\
-*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\
-daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0"