vlc | branch: master | Felix Paul Kühne <[email protected]> | Mon Jun 22 17:45:24 2015 +0200| [5a6765e203925c54d47d53ab8caaf49da62f4c17] | committer: Felix Paul Kühne
contrib/macosx: set deployment target to 10.7 and ensure that the libraries make use of libc++ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5a6765e203925c54d47d53ab8caaf49da62f4c17 --- contrib/src/main.mak | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index bf002f1..549ea4c 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -102,7 +102,7 @@ CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLAT endif ifdef HAVE_MACOSX -MIN_OSX_VERSION=10.6 +MIN_OSX_VERSION=10.7 CC=xcrun cc CXX=xcrun c++ AR=xcrun ar @@ -110,7 +110,8 @@ LD=xcrun ld STRIP=xcrun strip RANLIB=xcrun 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) +EXTRA_CXXFLAGS += -stdlib=libc++ +EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -lc++ -isysroot $(MACOSX_SDK) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION) ifeq ($(ARCH),x86_64) EXTRA_CFLAGS += -m64 EXTRA_LDFLAGS += -m64 @@ -169,7 +170,7 @@ cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1)) EXTRA_CFLAGS += -I$(PREFIX)/include CPPFLAGS := $(CPPFLAGS) $(EXTRA_CFLAGS) CFLAGS := $(CFLAGS) $(EXTRA_CFLAGS) -g -CXXFLAGS := $(CXXFLAGS) $(EXTRA_CFLAGS) -g +CXXFLAGS := $(CXXFLAGS) $(EXTRA_CFLAGS) $(EXTRA_CXXFLAGS) -g EXTRA_LDFLAGS += -L$(PREFIX)/lib LDFLAGS := $(LDFLAGS) $(EXTRA_LDFLAGS) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
