]> git.sesse.net Git - vlc/commitdiff
am: Support building VLC.app with an external build folder.
authorPierre d'Herbemont <pdherbemont@free.fr>
Wed, 13 Jan 2010 11:50:06 +0000 (12:50 +0100)
committerPierre d'Herbemont <pdherbemont@free.fr>
Fri, 15 Jan 2010 15:39:48 +0000 (16:39 +0100)
Makefile.am

index 20c2576ae2d4ef19cdeee9c85433100da121638b..5f00527bb075591fb9b9ed88c8e5ef783ee068cc 100644 (file)
@@ -492,9 +492,9 @@ VLC-release.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
        $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-        xcodebuild -target vlc $(silentstd) && \
+        xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
        cd ../../../../ && \
-       cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
+       cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
        PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
@@ -645,9 +645,9 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
        $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-       xcodebuild -target vlc $(silentstd) && \
+       xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
        cd ../../../../ && \
-       cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC.app
+       cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
        touch $(top_builddir)/VLC.app/Contents/MacOS/VLC
        chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC