From a807f93ba44a204dd29f4f9db1aaf6a64680ff38 Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Thu, 28 May 2015 20:43:27 -0500 Subject: [PATCH] Add wx lib copy to "shared" configurations in Xcode 5.x+ project --- .../project.pbxproj | 49 ++++++++++++------- mac/build_plugins.sh | 19 +------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/mac/Audacity_Xcode_5.1_with_10.6_sdk.xcodeproj/project.pbxproj b/mac/Audacity_Xcode_5.1_with_10.6_sdk.xcodeproj/project.pbxproj index 19235f70b..c8a12fe9c 100644 --- a/mac/Audacity_Xcode_5.1_with_10.6_sdk.xcodeproj/project.pbxproj +++ b/mac/Audacity_Xcode_5.1_with_10.6_sdk.xcodeproj/project.pbxproj @@ -11,7 +11,7 @@ isa = PBXAggregateTarget; buildConfigurationList = 17072E890988BD58008541CC /* Build configuration list for PBXAggregateTarget "Configure" */; buildPhases = ( - 17072E8C0988BD85008541CC /* Run Script */, + 17072E8C0988BD85008541CC /* Configure */, ); dependencies = ( ); @@ -6407,6 +6407,7 @@ 1790AFAE09883B6D008A330A /* Frameworks */, 28032560131DAFAF0059D002 /* Copy nyquist */, 28032580131DB4960059D002 /* Copy plug-ins */, + 28708D631B17C3C400496FEB /* Install wxWidgets libs */, 288F0980131A400F0008E860 /* Install manual */, 282413DA131D52CE009FD931 /* Install plugins */, 2892CE28131AFB1900E1E17D /* Install miscellany */, @@ -6721,7 +6722,7 @@ /* End PBXRezBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 17072E8C0988BD85008541CC /* Run Script */ = { + 17072E8C0988BD85008541CC /* Configure */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -6729,7 +6730,7 @@ inputPaths = ( "$(TOPLEVEL)/Makefile.in", ); - name = "Run Script"; + name = Configure; outputPaths = ( "$(TOPLEVEL)/Makefile", ); @@ -6797,6 +6798,20 @@ shellPath = /bin/sh; shellScript = "\"${PROJECT_DIR}/build_plugins.sh\""; }; + 28708D631B17C3C400496FEB /* Install wxWidgets libs */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 8; + files = ( + ); + inputPaths = ( + ); + name = "Install wxWidgets libs"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 1; + shellPath = /bin/sh; + shellScript = "#!/bin/sh\n\nupdate_paths()\n{\n base=$(basename \"${1}\")\n cp -p \"${1}\" \"${LIBPATH}\"\n\n for lib in $(otool -L \"${1}\" | awk '/libwx/{print $1}')\n do\n install_name_tool -change \"${lib}\" @loader_path/../Frameworks/$(basename \"${lib}\") \"${LIBPATH}/${base}\"\n done\n}\n\nEXEPATH=\"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\"\nLIBPATH=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\n\nmkdir -p \"${LIBPATH}\"\n\nfor lib in $(otool -L \"${EXEPATH}\" | awk '/libwx/{print $1}')\ndo\n install_name_tool -change \"${lib}\" @executable_path/../Frameworks/$(basename \"${lib}\") \"${EXEPATH}\"\n update_paths \"${lib}\"\ndone\n"; + }; 288F0980131A400F0008E860 /* Install manual */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 8; @@ -8056,6 +8071,7 @@ baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", @@ -8112,7 +8128,7 @@ "-lFLAC", ); PRODUCT_NAME = Audacity; - SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac/config/$(arch)/src/** $(TOPLEVEL)/mac $(TOPLEVEL)/src/** $(TOPLEVEL)/lib-src/FileDialog $(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libid3tag $(TOPLEVEL)/lib-src/lame $(TOPLEVEL)/mac/config/$(arch)/lib-src/libmad $(TOPLEVEL)/lib-src/libmad $(TOPLEVEL)/lib-src/libogg/include $(TOPLEVEL)/lib-src/libnyquist/nyq $(TOPLEVEL)/mac/config/$(arch)/lib-src/libsndfile/** $(TOPLEVEL)/lib-src/libsndfile/src $(TOPLEVEL)/lib-src/libsoxr/src $(TOPLEVEL)/lib-src/libvamp $(TOPLEVEL)/lib-src/libvorbis/include $(TOPLEVEL)/lib-src/portaudio-v19/include $(TOPLEVEL)/lib-src/portmixer/px_common $(TOPLEVEL)/lib-src/portsmf $(TOPLEVEL)/mac/config/$(arch)/lib-src/soundtouch/** $(TOPLEVEL)/lib-src/soundtouch/include $(TOPLEVEL)/lib-src/lv2/lv2 $(TOPLEVEL)/lib-src/lv2/lilv $(TOPLEVEL)/lib-src/lv2/suil $(TOPLEVEL)/lib-src/twolame/libtwolame $(TOPLEVEL)/mac/config/$(arch)/lib-src/sbsms/**"; }; name = "Debug Static"; @@ -8128,7 +8144,6 @@ FFMPEG_CFLAGS = "-I../lib-src/ffmpeg -D__STDC_CONSTANT_MACROS"; FFMPEG_CXXFLAGS = "$(FFMPEG_CFLAGS)"; FFMPEG_PREFIX = /usr/local; - GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = Info.plist.h; @@ -8447,10 +8462,7 @@ FFMPEG_CFLAGS = "-I../lib-src/ffmpeg -D__STDC_CONSTANT_MACROS"; FFMPEG_CXXFLAGS = "$(FFMPEG_CFLAGS)"; FFMPEG_PREFIX = /usr/local; - GCC_DYNAMIC_NO_PIC = NO; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_OPTIMIZATION_LEVEL = 0; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = Info.plist.h; INFOPLIST_PREPROCESS = YES; @@ -8462,7 +8474,7 @@ WX_CFLAGS = "-I$(WX_PREFIX)/lib/wx/include/mac-unicode-debug-$(WX_VER) -I$(WX_PREFIX)/include/wx-$(WX_VER) -D__WXDEBUG__ -D__WXMAC__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA"; WX_CONFIG = "$(WX_PREFIX)/bin/wx-config"; WX_CXXFLAGS = "$(WX_CFLAGS)"; - WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_macud_html-$(WX_VER) -lwx_macud_adv-$(WX_VER) -lwx_macud_core-$(WX_VER) -lwx_base_carbonud_net-$(WX_VER) -lwx_base_carbonud-$(WX_VER) $(WX_PREFIX)/lib/libwxregexud-$(WX_VER).a $(WX_PREFIX)/lib/libwxexpatd-$(WX_VER).a $(WX_PREFIX)/lib/libwxtiffd-$(WX_VER).a $(WX_PREFIX)/lib/libwxjpegd-$(WX_VER).a $(WX_PREFIX)/lib/libwxpngd-$(WX_VER).a"; + WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_macud_xrc-$(WX_VER) -lwx_macud_qa-$(WX_VER) -lwx_macud_html-$(WX_VER) -lwx_macud_adv-$(WX_VER) -lwx_macud_core-$(WX_VER) -lwx_base_carbonud_xml-$(WX_VER) -lwx_base_carbonud_net-$(WX_VER) -lwx_base_carbonud-$(WX_VER) $(WX_PREFIX)/lib/libwxregexud-$(WX_VER).a $(WX_PREFIX)/lib/libwxexpatd-$(WX_VER).a $(WX_PREFIX)/lib/libwxtiffd-$(WX_VER).a $(WX_PREFIX)/lib/libwxjpegd-$(WX_VER).a $(WX_PREFIX)/lib/libwxpngd-$(WX_VER).a"; WX_PREFIX = /usr/local; WX_VER = 2.8; ZERO_LINK = NO; @@ -8474,12 +8486,15 @@ baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "BUILDING_AUDACITY=1", "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", ); GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "AUDACITY_DLL_API=\"\""; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Audacity; LIBRARY_SEARCH_PATHS = ( @@ -8528,7 +8543,7 @@ "-lFLAC", ); PRODUCT_NAME = Audacity; - SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac/config/$(arch)/src/** $(TOPLEVEL)/mac $(TOPLEVEL)/src/** $(TOPLEVEL)/lib-src/FileDialog $(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libid3tag $(TOPLEVEL)/lib-src/lame $(TOPLEVEL)/mac/config/$(arch)/lib-src/libmad $(TOPLEVEL)/lib-src/libmad $(TOPLEVEL)/lib-src/libogg/include $(TOPLEVEL)/lib-src/libnyquist/nyq $(TOPLEVEL)/mac/config/$(arch)/lib-src/libsndfile/** $(TOPLEVEL)/lib-src/libsndfile/src $(TOPLEVEL)/lib-src/libsoxr/src $(TOPLEVEL)/lib-src/libvamp $(TOPLEVEL)/lib-src/libvorbis/include $(TOPLEVEL)/lib-src/portaudio-v19/include $(TOPLEVEL)/lib-src/portmixer/px_common $(TOPLEVEL)/lib-src/portsmf $(TOPLEVEL)/mac/config/$(arch)/lib-src/soundtouch/** $(TOPLEVEL)/lib-src/soundtouch/include $(TOPLEVEL)/lib-src/lv2/lv2 $(TOPLEVEL)/lib-src/lv2/lilv $(TOPLEVEL)/lib-src/lv2/suil $(TOPLEVEL)/lib-src/twolame/libtwolame $(TOPLEVEL)/mac/config/$(arch)/lib-src/sbsms/**"; }; name = "Debug Shared"; @@ -8784,10 +8799,7 @@ FFMPEG_CFLAGS = "-I../lib-src/ffmpeg -D__STDC_CONSTANT_MACROS"; FFMPEG_CXXFLAGS = "$(FFMPEG_CFLAGS)"; FFMPEG_PREFIX = /usr/local; - GCC_DYNAMIC_NO_PIC = NO; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_OPTIMIZATION_LEVEL = 3; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = Info.plist.h; INFOPLIST_PREPROCESS = YES; @@ -8799,7 +8811,7 @@ WX_CFLAGS = "-I$(WX_PREFIX)/lib/wx/include/mac-unicode-release-$(WX_VER) -I$(WX_PREFIX)/include/wx-$(WX_VER) -D__WXMAC__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA"; WX_CONFIG = "$(WX_PREFIX)/bin/wx-config"; WX_CXXFLAGS = "$(WX_CFLAGS)"; - WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_macu_html-$(WX_VER) -lwx_macu_adv-$(WX_VER) -lwx_macu_core-$(WX_VER) -lwx_base_carbonu_net-$(WX_VER) -lwx_base_carbonu-$(WX_VER) $(WX_PREFIX)/lib/libwxregexud-$(WX_VER).a $(WX_PREFIX)/lib/libwxexpatd-$(WX_VER).a $(WX_PREFIX)/lib/libwxtiffd-$(WX_VER).a $(WX_PREFIX)/lib/libwxjpegd-$(WX_VER).a $(WX_PREFIX)/lib/libwxpngd-$(WX_VER).a"; + WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_macu_xrc-$(WX_VER) -lwx_macu_qa-$(WX_VER) -lwx_macu_html-$(WX_VER) -lwx_macu_adv-$(WX_VER) -lwx_macu_core-$(WX_VER) -lwx_base_carbonu_xml-$(WX_VER) -lwx_base_carbonu_net-$(WX_VER) -lwx_base_carbonu-$(WX_VER) $(WX_PREFIX)/lib/libwxregexud-$(WX_VER).a $(WX_PREFIX)/lib/libwxexpatd-$(WX_VER).a $(WX_PREFIX)/lib/libwxtiffd-$(WX_VER).a $(WX_PREFIX)/lib/libwxjpegd-$(WX_VER).a $(WX_PREFIX)/lib/libwxpngd-$(WX_VER).a"; WX_PREFIX = /usr/local; WX_VER = 2.8; ZERO_LINK = NO; @@ -8811,6 +8823,8 @@ baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(TOPLEVEL)/src/AudacityHeaders.h"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -8819,6 +8833,7 @@ "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", ); GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "AUDACITY_DLL_API=\"\""; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Audacity; LIBRARY_SEARCH_PATHS = ( @@ -8867,7 +8882,7 @@ "-lFLAC", ); PRODUCT_NAME = Audacity; - SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac/config/$(arch)/src/** $(TOPLEVEL)/mac $(TOPLEVEL)/src/** $(TOPLEVEL)/lib-src/FileDialog $(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libid3tag $(TOPLEVEL)/lib-src/lame $(TOPLEVEL)/mac/config/$(arch)/lib-src/libmad $(TOPLEVEL)/lib-src/libmad $(TOPLEVEL)/lib-src/libogg/include $(TOPLEVEL)/lib-src/libnyquist/nyq $(TOPLEVEL)/mac/config/$(arch)/lib-src/libsndfile/** $(TOPLEVEL)/lib-src/libsndfile/src $(TOPLEVEL)/lib-src/libsoxr/src $(TOPLEVEL)/lib-src/libvamp $(TOPLEVEL)/lib-src/libvorbis/include $(TOPLEVEL)/lib-src/portaudio-v19/include $(TOPLEVEL)/lib-src/portmixer/px_common $(TOPLEVEL)/lib-src/portsmf $(TOPLEVEL)/mac/config/$(arch)/lib-src/soundtouch/** $(TOPLEVEL)/lib-src/soundtouch/include $(TOPLEVEL)/lib-src/lv2/lv2 $(TOPLEVEL)/lib-src/lv2/lilv $(TOPLEVEL)/lib-src/lv2/suil $(TOPLEVEL)/lib-src/twolame/libtwolame $(TOPLEVEL)/mac/config/$(arch)/lib-src/sbsms/**"; }; name = "Release Shared"; @@ -9367,6 +9382,7 @@ baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(TOPLEVEL)/src/AudacityHeaders.h"; @@ -9425,7 +9441,7 @@ "-lFLAC", ); PRODUCT_NAME = Audacity; - SKIP_INSTALL = NO; + STRIP_INSTALLED_PRODUCT = NO; USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac/config/$(arch)/src/** $(TOPLEVEL)/mac $(TOPLEVEL)/src/** $(TOPLEVEL)/lib-src/FileDialog $(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libid3tag $(TOPLEVEL)/lib-src/lame $(TOPLEVEL)/mac/config/$(arch)/lib-src/libmad $(TOPLEVEL)/lib-src/libmad $(TOPLEVEL)/lib-src/libogg/include $(TOPLEVEL)/lib-src/libnyquist/nyq $(TOPLEVEL)/mac/config/$(arch)/lib-src/libsndfile/** $(TOPLEVEL)/lib-src/libsndfile/src $(TOPLEVEL)/lib-src/libsoxr/src $(TOPLEVEL)/lib-src/libvamp $(TOPLEVEL)/lib-src/libvorbis/include $(TOPLEVEL)/lib-src/portaudio-v19/include $(TOPLEVEL)/lib-src/portmixer/px_common $(TOPLEVEL)/lib-src/portsmf $(TOPLEVEL)/mac/config/$(arch)/lib-src/soundtouch/** $(TOPLEVEL)/lib-src/soundtouch/include $(TOPLEVEL)/lib-src/lv2/lv2 $(TOPLEVEL)/lib-src/lv2/lilv $(TOPLEVEL)/lib-src/lv2/suil $(TOPLEVEL)/lib-src/twolame/libtwolame $(TOPLEVEL)/mac/config/$(arch)/lib-src/sbsms/**"; }; name = "Release Static"; @@ -9441,7 +9457,6 @@ FFMPEG_CFLAGS = "-I../lib-src/ffmpeg -D__STDC_CONSTANT_MACROS"; FFMPEG_CXXFLAGS = "$(FFMPEG_CFLAGS)"; FFMPEG_PREFIX = /usr/local; - GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 3; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = Info.plist.h; diff --git a/mac/build_plugins.sh b/mac/build_plugins.sh index dcdf83c7a..d36b697df 100755 --- a/mac/build_plugins.sh +++ b/mac/build_plugins.sh @@ -83,23 +83,8 @@ function buildAction # Get to where we need to be cd "${swhpath}" - # We won't be using fftw, but configure won't complete without it, so just - # create a dummy pkg-config file. - export PKG_CONFIG_PATH="." - cat <fftw3f.pc -Name: FFTW -Description: dummy for pkg-config -Version: 3.0.0 -Libs: -Cflags: -EOF - - # Run configure - if [ ! -e "config.status" ] - then - echo "Configuring plugins" - ./configure --disable-dependency-tracking --enable-shared --disable-static >/dev/null 2>&1 - fi + # Get rid of the existing config.h options + echo >config.h # Build the 2 standard plugins build hard_limiter_1413 hard_limiter_1413.c