Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 08:09:32 +02:00
Code Issues Releases Wiki Activity

build_wxwidgets now loops over two architectures; change install path...

Browse Source 
... to include architecture, so the 64 bit build doesn't destroy the 32, thus
the results are found in:

/usr/local/i386/lib
/usr/local/x86_64/lib

whereas before all was in /usr/local/lib.

Change the XCode project too, to look for includes and libraries in the new
places.
This commit is contained in:
Paul Licameli 2018-11-15 12:45:07 -05:00
parent fe19c848be
commit 407b7fab4a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mac/Audacity.xcodeproj/project.pbxproj
View File

@ -8614,7 +8614,7 @@
WX_CXXFLAGS = "$(WX_CFLAGS)"; WX_CXXFLAGS = "$(WX_CFLAGS)";
WX_FLAVOR = debug; 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_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_PREFIX = "/usr/local/$(ARCHS)";
WX_VER = 3.1; WX_VER = 3.1;
ZERO_LINK = NO; ZERO_LINK = NO;
}; };
@ -8941,7 +8941,7 @@
WX_CXXFLAGS = "$(WX_CFLAGS)"; WX_CXXFLAGS = "$(WX_CFLAGS)";
WX_FLAVOR = release; 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_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_PREFIX = "/usr/local/$(ARCHS)";
WX_VER = 3.1; WX_VER = 3.1;
ZERO_LINK = NO; ZERO_LINK = NO;
}; };

6
mac/scripts/build_wxwidgets
View File

@ -33,9 +33,11 @@ function bld
shift shift
arch_option="--enable-macosx-arch=${1}" arch_option="--enable-macosx-arch=${1}"
prefix_option="--prefix=/usr/local/${1}"
shift shift
../configure ${arch_option} \ ../configure ${prefix_option} \
${arch_option} \
--with-expat=builtin \ --with-expat=builtin \
--with-zlib=builtin \ --with-zlib=builtin \
--with-regex=builtin \ --with-regex=builtin \
@ -58,7 +60,7 @@ function inst
popd popd
} }
for architecture in 'i386'; do { for architecture in 'i386' 'x86_64'; do {
std='' std=''
stdlib='-stdlib=libstdc++' stdlib='-stdlib=libstdc++'
if [ ${max} -gt 1060 ] if [ ${max} -gt 1060 ]