From fc473ba500fe4dc4e50c671b94dadc9bfbc42292 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 14 Apr 2018 13:46:56 -0400 Subject: [PATCH] Mac: script to build wx 3.1.1 & change xcodeproj to use 10.7 minimum --- mac/Audacity.xcodeproj/project.pbxproj | 18 ++++++------------ mac/scripts/build_wxwidgets | 13 ++++++------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj index 8eb9a402c..63532e291 100644 --- a/mac/Audacity.xcodeproj/project.pbxproj +++ b/mac/Audacity.xcodeproj/project.pbxproj @@ -8493,10 +8493,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++1z"; - "CLANG_CXX_LANGUAGE_STANDARD[sdk=macosx10.6]" = "c++11"; - "CLANG_CXX_LANGUAGE_STANDARD[sdk=macosx10.7]" = "c++1z"; - "CLANG_CXX_LIBRARY[sdk=macosx10.6]" = "libstdc++"; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; "CLANG_CXX_LIBRARY[sdk=macosx10.7]" = "libc++"; CONFIG_DEBUG = yes; CONFIG_FLAGS = ""; @@ -8515,7 +8512,7 @@ "-Xlinker", "-headerpad_max_install_names", ); - SDKROOT = macosx10.6; + SDKROOT = macosx10.7; SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386"; TOPLEVEL = ..; WARNING_CFLAGS = ""; @@ -8525,7 +8522,7 @@ WX_FLAVOR = debug; WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_osx_cocoau_$(WX_FLAVOR)_xrc-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_webview-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_html-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_qa-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_adv-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_core-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_xml-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_net-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)-$(WX_VER)"; WX_PREFIX = /usr/local; - WX_VER = 3.0; + WX_VER = 3.1; ZERO_LINK = NO; }; name = Debug; @@ -8820,10 +8817,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++1z"; - "CLANG_CXX_LANGUAGE_STANDARD[sdk=macosx10.6]" = "c++11"; - "CLANG_CXX_LANGUAGE_STANDARD[sdk=macosx10.7]" = "c++1z"; - "CLANG_CXX_LIBRARY[sdk=macosx10.6]" = "libstdc++"; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; "CLANG_CXX_LIBRARY[sdk=macosx10.7]" = "libc++"; CONFIG_DEBUG = no; CONFIG_FLAGS = ""; @@ -8842,7 +8836,7 @@ "-Xlinker", "-headerpad_max_install_names", ); - SDKROOT = macosx10.6; + SDKROOT = macosx10.7; SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386"; TOPLEVEL = ..; WARNING_CFLAGS = ""; @@ -8852,7 +8846,7 @@ WX_FLAVOR = release; WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_osx_cocoau_$(WX_FLAVOR)_xrc-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_webview-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_html-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_qa-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_adv-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_core-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_xml-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_net-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)-$(WX_VER)"; WX_PREFIX = /usr/local; - WX_VER = 3.0; + WX_VER = 3.1; ZERO_LINK = NO; }; name = Release; diff --git a/mac/scripts/build_wxwidgets b/mac/scripts/build_wxwidgets index 42daf3676..c7e6e1913 100755 --- a/mac/scripts/build_wxwidgets +++ b/mac/scripts/build_wxwidgets @@ -6,9 +6,9 @@ # sudo /build_wxwidgets # -# Currently, Audacity is built using the 10.6 SDK, but you may choose to target -# 10.7 or greater by changing this variable. -min=10.6 +# Currently, Audacity is built using the 10.7 SDK, but you may choose to target +# 10.8 or greater by changing this variable. +min=10.7 # You shouldn't need to change this, but just in case you put Xcode in a non-standard # location, update this appropriately. @@ -52,8 +52,7 @@ function bld shift ../configure --disable-accessibility \ - --disable-compat26 \ - --disable-compat28 \ + --enable-macosx-arch=i386 \ --with-expat=builtin \ --with-zlib=builtin \ --with-regex=builtin \ @@ -77,8 +76,8 @@ function inst } # Build all configurations -bld bld_debug --enable-debug=yes --enable-static=no --enable-shared=yes --with-flavour=debug -bld bld_release --enable-debug=no --enable-static=no --enable-shared=yes --with-flavour=release +bld bld_debug --enable-debug=yes --enable-shared=yes --with-flavour=debug +bld bld_release --enable-debug=no --enable-shared=yes --with-flavour=release # Install all configurations inst bld_debug