vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Thu 
Dec  8 18:58:46 2011 +0100| [a4ba0b02f8fba19a45b748a7f45b08ee45319b5a] | 
committer: Jean-Baptiste Kempf

Contribs: try to maintain X.5 runtime compatibility

Signed-off-by: Jean-Baptiste Kempf <[email protected]>
(cherry picked from commit 1b58a20c4daeb20f70709fd30c176cae65acd7cb)

Signed-off-by: Jean-Baptiste Kempf <[email protected]>

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

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

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index c900755..29c1f0e 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -107,6 +107,8 @@ 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)
 CC=gcc-4.2
@@ -115,8 +117,8 @@ AR=ar
 LD=ld
 STRIP=strip
 RANLIB=ranlib
-EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(OSX_VERSION)
-EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) 
-mmacosx-version-min=$(OSX_VERSION) -isysroot $(MACOSX_SDK)
+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

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to