[vlc-commits] Contribs: support for PPC in contribs

[Jean-Baptiste Kempf]

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Dec 14 02:03:03 2011 +0100| [5f166b8807a270d1d0d3182dbaca058cc43bb7f1] | committer: Jean-Baptiste Kempf

Contribs: support for PPC in contribs

CrossCompiling from intel64 to PPC should mostly work on X.6 now

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit ccfcea33533fd56e7af00f9086364b8f266bd684)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=5f166b8807a270d1d0d3182dbaca058cc43bb7f1
---

 contrib/src/main.mak |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 29c1f0e..aa58d90 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -107,7 +107,6 @@ endif
 endif
 
 ifdef HAVE_MACOSX
-OSX_VERSION=10.6
 MIN_OSX_VERSION=10.5
 MACOSX_SDK=/Developer/SDKs/MacOSX$(OSX_VERSION).sdk
 PATH :=$(abspath ../../extras/tools/build/bin):$(abspath ../$(BUILD)/bin):$(PATH)
@@ -119,14 +118,18 @@ STRIP=strip
 RANLIB=ranlib
 EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
 EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -isysroot $(MACOSX_SDK) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
-#TODO ppc
 ifeq ($(ARCH),x86_64)
 EXTRA_CFLAGS += -m64
 EXTRA_LDFLAGS += -m64
 else
+ifeq ($(ARCH), ppc)
+EXTRA_CFLAGS += -arch ppc
+EXTRA_LDFLAGS += -arch ppc
+else
 EXTRA_CFLAGS += -m32
 EXTRA_LDFLAGS += -m32
 endif
+endif
 
 XCODE_FLAGS = -sdk macosx$(OSX_VERSION)
 ifeq ($(shell xcodebuild -version 2>/dev/null | tee /dev/null|head -1|cut -d\  -f2|cut -d. -f1),3)