diff options
| author | Eoin Hennessy <eoin@randomrules.org> | 2009-02-22 01:21:31 +0000 |
|---|---|---|
| committer | Eoin Hennessy <eoinh@src.gnome.org> | 2009-02-22 01:21:31 +0000 |
| commit | e807da07ace52c91e47ebe99721769797eb0ed15 (patch) | |
| tree | cb86b14a24b122a85ff431f8d8304abf3af3ad32 | |
| parent | cb7b57886e571c69c9fcbcb042f7509926fe8c67 (diff) | |
Enable running uninstalled on OSX and make sure that the value for 'db' is
2009-02-21 Eoin Hennessy <eoin@randomrules.org>
* src/run-banshee: Enable running uninstalled on OSX and make sure that the value
for 'db' is actually used.
* build/osx/build.env: Taglib# is now installed into /share, add it to build env.
svn path=/trunk/banshee/; revision=5056
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | build/osx/build.env | 2 | ||||
| -rwxr-xr-x | src/run-banshee | 13 |
3 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2009-02-21 Eoin Hennessy <eoin@randomrules.org> + + * src/run-banshee: Enable running uninstalled on OSX and make sure that the value + for 'db' is actually used. + + * build/osx/build.env: Taglib# is now installed into /share, add it to build env. + 2009-02-20 Gabriel Burt <gabriel.burt@gmail.com> Patch from John Millikin removing some cruft and changing the podcast diff --git a/build/osx/build.env b/build/osx/build.env index 411f2f664..0075b2858 100644 --- a/build/osx/build.env +++ b/build/osx/build.env @@ -23,7 +23,7 @@ BUILD_PREFIX="${ROOTS_PREFIX}/bundle-install" export PATH="$BUILD_PREFIX/bin:$ROOTS_PREFIX/gettext-install/bin:$MONO_SDK_PATH/bin:/usr/bin:/bin" export LD_LIBRARY_PATH="$BUILD_PREFIX/lib:$MONO_SDK_PATH/lib:$LD_LIBRARY_PATH" -export PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig:$MONO_SDK_PATH/lib/pkgconfig:$MONO_SDK_PATH/share/pkgconfig" +export PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig:$BUILD_PREFIX/share/pkgconfig:$MONO_SDK_PATH/lib/pkgconfig:$MONO_SDK_PATH/share/pkgconfig" export LDFLAGS="-L$BUILD_PREFIX/lib -L$MONO_SDK_PATH/lib $LDFLAGS" export ACLOCAL_FLAGS="-I $BUILD_PREFIX/share/aclocal -I $MONO_SDK_PATH/share/aclocal" diff --git a/src/run-banshee b/src/run-banshee index c4c5d6f99..7032bc53a 100755 --- a/src/run-banshee +++ b/src/run-banshee @@ -1,3 +1,14 @@ #!/bin/bash -BANSHEE_DEV_OPTIONS="--db $PWD/banshee.db2" make run +if [ $(uname) == "Darwin" ] +then + MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current + BUNDLE_DEPS_PATH=../build/osx/deps/bundle-install + + export GST_REGISTRY_FORK=no + export GST_PLUGIN_SYSTEM_PATH=$BUNDLE_DEPS_PATH/lib/gstreamer-0.10 + export MONO_GAC_PREFIX=$BUNDLE_DEPS_PATH + export DYLD_FALLBACK_LIBRARY_PATH=$BUNDLE_DEPS_PATH/lib:$MONO_FRAMEWORK_PATH/lib:/usr/lib:/lib${DYLD_FALLBACK_LIBRARY_PATH+:$DYLD_FALLBACK_LIBRARY_PATH} +fi + +BANSHEE_DEV_OPTIONS="--db=$PWD/banshee.db2" make run |