npapi-vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Mon May 11 15:03:40 2015 +0200| [d65a00f0f92e6afe4aa13264092add2d0601680a] | committer: Hugo Beauzée-Luyssen
macos: Enable C++11 Including for ObjC++ files. This requires us to move to 10.7 as a minimal SDK. > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=d65a00f0f92e6afe4aa13264092add2d0601680a --- configure.ac | 6 +++--- extras/macosx/build-plugin.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index e8d4d0a..42ce626 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,7 @@ AC_USE_SYSTEM_EXTENSIONS AC_DEFINE([_FORTIFY_SOURCE], 2, [Define to '2' to get glibc warnings.]) AC_PROG_CXX AC_PROG_OBJCXX -AX_CXX_COMPILE_STDCXX_11([], [mandatory]) +AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) dnl override platform specific check for dependent libraries dnl otherwise libtool linking of shared libraries will @@ -90,8 +90,8 @@ case "${host_os}" in esac CFLAGS="${CFLAGS} -fobjc-exceptions -D_INTL_REDIRECT_MACROS ${ARCH_flag}" - CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}" - OBJCXXFLAGS="${OBJCXXFLAGS} -fobjc-exceptions -D_INTL_REDIRECT_MACROS ${ARCH_flag}" + CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag} -stdlib=libc++" + OBJCXXFLAGS="${OBJCXXFLAGS} -fobjc-exceptions -D_INTL_REDIRECT_MACROS ${ARCH_flag} -stdlib=libc++ -std=c++11" CPPFLAGS="${CPPFLAGS} ${ARCH_flag}" LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}" ;; diff --git a/extras/macosx/build-plugin.sh b/extras/macosx/build-plugin.sh index da9ccbd..ee8fa6e 100755 --- a/extras/macosx/build-plugin.sh +++ b/extras/macosx/build-plugin.sh @@ -9,7 +9,7 @@ info() } ARCH="x86_64" -MINIMAL_OSX_VERSION="10.6" +MINIMAL_OSX_VERSION="10.7" OSX_VERSION="10.9" SDKROOT=`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk VERBOSE=no _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
