From d344ff8f88e367c608a8b5633f4d3e6a5eaf5529 Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Tue, 21 Apr 2015 16:52:53 -0500 Subject: [PATCH] Updating new Xcode project This provides additional improvements and updates for building Audacity using Xcode 5.1 or above. The whole configure/makefile system is no longer used during normal builds. During library additions/updates it used to regenerated the headers in mac/config. --- .gitignore | 12 +- .../project.pbxproj | 590 ++++++----- mac/build_plugins.sh | 11 +- mac/config.readme | 6 + mac/config/i386/lib-src/expat/expat_config.h | 111 ++ mac/config/i386/lib-src/libflac/config.h | 238 +++++ mac/config/i386/lib-src/libid3tag/config.h | 87 ++ mac/config/i386/lib-src/libmad/config.h | 215 ++++ mac/config/i386/lib-src/libmad/mad.h | 964 ++++++++++++++++++ mac/config/i386/lib-src/libogg/config.h | 102 ++ .../lib-src/libogg/include/ogg/config_types.h | 25 + .../i386/lib-src/libsndfile/src/config.h | 300 ++++++ .../i386/lib-src/libsndfile/src/sndfile.h | 666 ++++++++++++ mac/config/i386/lib-src/libsoxr/soxr-config.h | 52 + mac/config/i386/lib-src/libvorbis/config.h | 98 ++ .../i386/lib-src/lv2/lilv/lilv_config.h | 19 + .../i386/lib-src/lv2/serd/serd_config.h | 12 + .../i386/lib-src/lv2/sord/sord_config.h | 10 + .../i386/lib-src/lv2/sratom/sratom_config.h | 11 + .../i386/lib-src/lv2/sratom/suil_config.h | 16 + mac/config/i386/lib-src/sbsms/src/config.h | 75 ++ .../soundtouch/include/soundtouch_config.h | 97 ++ .../i386/lib-src/twolame/libtwolame/config.h | 105 ++ mac/config/i386/src/configunix.h | 196 ++++ .../wxMac-2.8.12-wxaccessible.patch | 81 +- 25 files changed, 3809 insertions(+), 290 deletions(-) create mode 100644 mac/config.readme create mode 100644 mac/config/i386/lib-src/expat/expat_config.h create mode 100644 mac/config/i386/lib-src/libflac/config.h create mode 100644 mac/config/i386/lib-src/libid3tag/config.h create mode 100644 mac/config/i386/lib-src/libmad/config.h create mode 100644 mac/config/i386/lib-src/libmad/mad.h create mode 100644 mac/config/i386/lib-src/libogg/config.h create mode 100644 mac/config/i386/lib-src/libogg/include/ogg/config_types.h create mode 100644 mac/config/i386/lib-src/libsndfile/src/config.h create mode 100644 mac/config/i386/lib-src/libsndfile/src/sndfile.h create mode 100644 mac/config/i386/lib-src/libsoxr/soxr-config.h create mode 100644 mac/config/i386/lib-src/libvorbis/config.h create mode 100644 mac/config/i386/lib-src/lv2/lilv/lilv_config.h create mode 100644 mac/config/i386/lib-src/lv2/serd/serd_config.h create mode 100644 mac/config/i386/lib-src/lv2/sord/sord_config.h create mode 100644 mac/config/i386/lib-src/lv2/sratom/sratom_config.h create mode 100644 mac/config/i386/lib-src/lv2/sratom/suil_config.h create mode 100644 mac/config/i386/lib-src/sbsms/src/config.h create mode 100644 mac/config/i386/lib-src/soundtouch/include/soundtouch_config.h create mode 100644 mac/config/i386/lib-src/twolame/libtwolame/config.h create mode 100644 mac/config/i386/src/configunix.h diff --git a/.gitignore b/.gitignore index 3da21734f..79e4f0d3c 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,14 @@ *.exe *.out *.app -win/resetPrefs.txt -src/RevisionIdent.h + +# Mac Specific +.DS_Store +project.xcworkspace +xcuserdata + +*.xcconfig +mac/Info.plist.h +src/RevisionIdent.h +win/resetPrefs.txt 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 6ec9f8e80..d025f25a6 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 @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXAggregateTarget section */ @@ -21,7 +21,6 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 17048268098C0F5F00824C66 /* mad.h in Headers */ = {isa = PBXBuildFile; fileRef = 17048267098C0F5F00824C66 /* mad.h */; }; 17073F630988E13B008541CC /* compat.c in Sources */ = {isa = PBXBuildFile; fileRef = 17072F810988D6A9008541CC /* compat.c */; }; 17073F640988E13B008541CC /* compat.h in Headers */ = {isa = PBXBuildFile; fileRef = 17072F830988D6A9008541CC /* compat.h */; }; 17073F650988E13B008541CC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 17072F850988D6A9008541CC /* config.h */; }; @@ -59,7 +58,6 @@ 17073F870988E13B008541CC /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = 17072FD00988D6A9008541CC /* version.h */; }; 17073FC50988E577008541CC /* bit.c in Sources */ = {isa = PBXBuildFile; fileRef = 17072FE10988D6A9008541CC /* bit.c */; }; 17073FC60988E577008541CC /* bit.h in Headers */ = {isa = PBXBuildFile; fileRef = 17072FE20988D6A9008541CC /* bit.h */; }; - 17073FC70988E577008541CC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 17072FE50988D6A9008541CC /* config.h */; }; 17073FC80988E577008541CC /* decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 17072FF40988D6A9008541CC /* decoder.c */; }; 17073FC90988E577008541CC /* decoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 17072FF50988D6A9008541CC /* decoder.h */; }; 17073FCA0988E577008541CC /* fixed.c in Sources */ = {isa = PBXBuildFile; fileRef = 17072FF70988D6A9008541CC /* fixed.c */; }; @@ -88,7 +86,6 @@ 170740250988EEBA008541CC /* command.c in Sources */ = {isa = PBXBuildFile; fileRef = 1707349D0988D6AD008541CC /* command.c */; }; 170740260988EEBA008541CC /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 1707349E0988D6AD008541CC /* common.c */; }; 170740270988EEBA008541CC /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = 1707349F0988D6AD008541CC /* common.h */; }; - 170740280988EEBA008541CC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 170734A00988D6AD008541CC /* config.h */; }; 170740290988EEBA008541CC /* dither.c in Sources */ = {isa = PBXBuildFile; fileRef = 170734A40988D6AD008541CC /* dither.c */; }; 1707402A0988EEBA008541CC /* double64.c in Sources */ = {isa = PBXBuildFile; fileRef = 170734A50988D6AD008541CC /* double64.c */; }; 1707402B0988EEBA008541CC /* dwd.c in Sources */ = {isa = PBXBuildFile; fileRef = 170734A60988D6AD008541CC /* dwd.c */; }; @@ -104,7 +101,6 @@ 170740360988EEBA008541CC /* g72x_priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 170734BB0988D6AD008541CC /* g72x_priv.h */; }; 170740370988EEBA008541CC /* add.c in Sources */ = {isa = PBXBuildFile; fileRef = 170734D20988D6AD008541CC /* add.c */; }; 170740380988EEBA008541CC /* code.c in Sources */ = {isa = PBXBuildFile; fileRef = 170734D40988D6AD008541CC /* code.c */; }; - 170740390988EEBA008541CC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 170734D50988D6AD008541CC /* config.h */; }; 1707403A0988EEBA008541CC /* decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 170734D80988D6AD008541CC /* decode.c */; }; 1707403B0988EEBA008541CC /* gsm.h in Headers */ = {isa = PBXBuildFile; fileRef = 170734D90988D6AD008541CC /* gsm.h */; }; 1707403C0988EEBA008541CC /* gsm610_priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 170734DA0988D6AD008541CC /* gsm610_priv.h */; }; @@ -141,7 +137,6 @@ 1707405B0988EEBA008541CC /* sf_unistd.h in Headers */ = {isa = PBXBuildFile; fileRef = 170735010988D6AD008541CC /* sf_unistd.h */; }; 1707405C0988EEBA008541CC /* sfendian.h in Headers */ = {isa = PBXBuildFile; fileRef = 170735020988D6AD008541CC /* sfendian.h */; }; 1707405D0988EEBA008541CC /* sndfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 170735030988D6AD008541CC /* sndfile.c */; }; - 1707405E0988EEBA008541CC /* sndfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 170735040988D6AD008541CC /* sndfile.h */; }; 1707405F0988EEBA008541CC /* strings.c in Sources */ = {isa = PBXBuildFile; fileRef = 170735070988D6AD008541CC /* strings.c */; }; 170740600988EEBA008541CC /* svx.c in Sources */ = {isa = PBXBuildFile; fileRef = 170735080988D6AD008541CC /* svx.c */; }; 170740610988EEBA008541CC /* txw.c in Sources */ = {isa = PBXBuildFile; fileRef = 170735100988D6AD008541CC /* txw.c */; }; @@ -169,7 +164,6 @@ 170740890988F1CC008541CC /* SoundTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1707383D0988D6B0008541CC /* SoundTouch.cpp */; }; 1707408A0988F1CC008541CC /* TDStretch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 170738410988D6B0008541CC /* TDStretch.cpp */; }; 1707408B0988F1CC008541CC /* TDStretch.h in Headers */ = {isa = PBXBuildFile; fileRef = 170738420988D6B0008541CC /* TDStretch.h */; }; - 170740D50988F835008541CC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 170735820988D6AD008541CC /* config.h */; }; 170740D60988F835008541CC /* codec.h in Headers */ = {isa = PBXBuildFile; fileRef = 1707363D0988D6AE008541CC /* codec.h */; }; 170740D70988F835008541CC /* vorbisenc.h in Headers */ = {isa = PBXBuildFile; fileRef = 170736420988D6AE008541CC /* vorbisenc.h */; }; 170740D80988F835008541CC /* vorbisfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 170736430988D6AE008541CC /* vorbisfile.h */; }; @@ -262,8 +256,6 @@ 176EEC2109A2F2FA00188F3B /* metadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 176EEB5C09A2EF1100188F3B /* metadata.cpp */; }; 176EEC2409A2F2FA00188F3B /* stream_decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 176EEB6809A2EF1100188F3B /* stream_decoder.cpp */; }; 176EEC2509A2F2FA00188F3B /* stream_encoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 176EEB6C09A2EF1100188F3B /* stream_encoder.cpp */; }; - 176EEC2709A2F30800188F3B /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 176EE9F209A2EF1000188F3B /* config.h */; }; - 176EEC2809A2F30A00188F3B /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 176EE9F209A2EF1000188F3B /* config.h */; settings = {ATTRIBUTES = (); }; }; 176EEC2B09A2F31300188F3B /* callback.h in Headers */ = {isa = PBXBuildFile; fileRef = 176EEA1109A2EF1000188F3B /* callback.h */; settings = {ATTRIBUTES = (); }; }; 176EEC2C09A2F31300188F3B /* export.h in Headers */ = {isa = PBXBuildFile; fileRef = 176EEA1209A2EF1000188F3B /* export.h */; settings = {ATTRIBUTES = (); }; }; 176EEC2F09A2F31300188F3B /* format.h in Headers */ = {isa = PBXBuildFile; fileRef = 176EEA1509A2EF1000188F3B /* format.h */; settings = {ATTRIBUTES = (); }; }; @@ -398,8 +390,6 @@ 17C99D5F098971390041B1BC /* libsoundtouch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1707407A0988F1BB008541CC /* libsoundtouch.a */; }; 17C99D60098971390041B1BC /* libportmixer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 170740960988F2F7008541CC /* libportmixer.a */; }; 17CBAE4A098B85CD00575C58 /* libnyquist.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 176A1A5B098B7B8D00DC73B4 /* libnyquist.a */; }; - 17FDBCFE098BFF4E00BCEF32 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 170731F30988D6AA008541CC /* config.h */; }; - 17FDBCFF098BFF4E00BCEF32 /* config_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 170732F20988D6AB008541CC /* config_types.h */; }; 17FDBD00098BFF4E00BCEF32 /* ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = 170732F80988D6AB008541CC /* ogg.h */; }; 17FDBD01098BFF4E00BCEF32 /* os_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 170732F90988D6AB008541CC /* os_types.h */; }; 17FDBD02098BFF4E00BCEF32 /* bitwise.c in Sources */ = {isa = PBXBuildFile; fileRef = 170733980988D6AC008541CC /* bitwise.c */; }; @@ -453,7 +443,6 @@ 28105DAC0AD09FC500BB4269 /* px_mixer.h in Headers */ = {isa = PBXBuildFile; fileRef = 28105DA20AD09FC500BB4269 /* px_mixer.h */; }; 2810644B1818EEB5004F678B /* cpu_detect_x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2810644A1818EEB5004F678B /* cpu_detect_x86.cpp */; }; 2810644D1818EED3004F678B /* cpu_detect.h in Headers */ = {isa = PBXBuildFile; fileRef = 2810644C1818EED3004F678B /* cpu_detect.h */; }; - 281110001AD4FDD8009FAC14 /* suil_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 28110FFF1AD4FDD8009FAC14 /* suil_config.h */; }; 2816372E0BAE3B6C0079C746 /* LinkingHtmlWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2816372C0BAE3B6C0079C746 /* LinkingHtmlWindow.cpp */; }; 28285C801A27A81600BC2205 /* AudioUnitCocoaHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 28285C7F1A27A81600BC2205 /* AudioUnitCocoaHelper.mm */; }; 282D474C0B9E8D900034BC49 /* Snap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 282D474A0B9E8D900034BC49 /* Snap.cpp */; }; @@ -461,7 +450,6 @@ 283135FF0DFBA2E80076D551 /* FFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 283135FD0DFBA2E80076D551 /* FFmpeg.cpp */; }; 2835062D0A3A88ED00EB1EBD /* pa_unix_util.c in Sources */ = {isa = PBXBuildFile; fileRef = 283506280A3A88ED00EB1EBD /* pa_unix_util.c */; }; 2835062E0A3A88ED00EB1EBD /* pa_unix_util.h in Headers */ = {isa = PBXBuildFile; fileRef = 283506290A3A88ED00EB1EBD /* pa_unix_util.h */; }; - 2835D8D11833D54100CF5EFF /* expat_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 2835D8D01833D54100CF5EFF /* expat_config.h */; }; 283A11A50A2C0DE7004372C4 /* broadcast.c in Sources */ = {isa = PBXBuildFile; fileRef = 283A11A40A2C0DE7004372C4 /* broadcast.c */; }; 283A11AA0A2C0E15004372C4 /* ShuttleGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 283A11A60A2C0E15004372C4 /* ShuttleGui.cpp */; }; 283A11AB0A2C0E15004372C4 /* Theme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 283A11A80A2C0E15004372C4 /* Theme.cpp */; }; @@ -510,7 +498,6 @@ 2840CF740AEB807E00F49FC3 /* twolame.h in Headers */ = {isa = PBXBuildFile; fileRef = 2840CF4A0AEB807E00F49FC3 /* twolame.h */; }; 2840CF750AEB807E00F49FC3 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = 2840CF4B0AEB807E00F49FC3 /* util.c */; }; 2840CF760AEB807E00F49FC3 /* util.h in Headers */ = {isa = PBXBuildFile; fileRef = 2840CF4C0AEB807E00F49FC3 /* util.h */; }; - 2840CF7A0AEB810000F49FC3 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 2840CF790AEB810000F49FC3 /* config.h */; }; 2840CF860AEB83DB00F49FC3 /* ExportMP2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2840CF840AEB83DB00F49FC3 /* ExportMP2.cpp */; }; 2840CFA80AEB883500F49FC3 /* libtwolame.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2840CF220AEB803C00F49FC3 /* libtwolame.a */; }; 284249EE10D337CE004330A6 /* GetProjectInfoCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 284249EA10D337CE004330A6 /* GetProjectInfoCommand.cpp */; }; @@ -787,15 +774,12 @@ 286229EA181CE62A00E1AD1A /* sord_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 286229E6181CE62A00E1AD1A /* sord_internal.h */; }; 286229EB181CE62A00E1AD1A /* sord.c in Sources */ = {isa = PBXBuildFile; fileRef = 286229E7181CE62A00E1AD1A /* sord.c */; }; 286229EC181CE62A00E1AD1A /* syntax.c in Sources */ = {isa = PBXBuildFile; fileRef = 286229E8181CE62A00E1AD1A /* syntax.c */; }; - 28624C0E181CE65700E1AD1A /* sratom_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 2862439F181CE65500E1AD1A /* sratom_config.h */; }; 28624C0F181CE65700E1AD1A /* sratom.h in Headers */ = {isa = PBXBuildFile; fileRef = 286243A0181CE65500E1AD1A /* sratom.h */; }; 28624C10181CE65700E1AD1A /* sratom.c in Sources */ = {isa = PBXBuildFile; fileRef = 286243A1181CE65500E1AD1A /* sratom.c */; }; 2862CED11AD3900000A53194 /* test.lsp in Resources */ = {isa = PBXBuildFile; fileRef = 2862CECE1AD3900000A53194 /* test.lsp */; }; 2862CED21AD3900000A53194 /* upic.sal in Resources */ = {isa = PBXBuildFile; fileRef = 2862CECF1AD3900000A53194 /* upic.sal */; }; 2862CED31AD3900000A53194 /* velocity.lsp in Resources */ = {isa = PBXBuildFile; fileRef = 2862CED01AD3900000A53194 /* velocity.lsp */; }; - 28640874181CE74100CC4E2C /* sord_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 28640873181CE74100CC4E2C /* sord_config.h */; }; - 28640876181CE75800CC4E2C /* serd_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 28640875181CE75800CC4E2C /* serd_config.h */; }; - 28640878181CE77200CC4E2C /* lilv_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 28640877181CE77200CC4E2C /* lilv_config.h */; }; + 2867F1E81AE60CD900011DB5 /* FileDialogPrivate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28F5C10F0BE5886A00D17341 /* FileDialogPrivate.cpp */; }; 287DBE890F3F6B2700C5BBED /* audio_detect.c in Sources */ = {isa = PBXBuildFile; fileRef = 287DBE830F3F6B2700C5BBED /* audio_detect.c */; }; 287DBE8A0F3F6B2700C5BBED /* chunk.c in Sources */ = {isa = PBXBuildFile; fileRef = 287DBE840F3F6B2700C5BBED /* chunk.c */; }; 287DBE8B0F3F6B2700C5BBED /* ima_oki_adpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 287DBE850F3F6B2700C5BBED /* ima_oki_adpcm.c */; }; @@ -914,6 +898,30 @@ 28BD8AB3101DF4C700686679 /* ExecMenuCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28BD8AAC101DF4C600686679 /* ExecMenuCommand.cpp */; }; 28BD8AB4101DF4C700686679 /* GetAllMenuCommands.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28BD8AAE101DF4C600686679 /* GetAllMenuCommands.cpp */; }; 28C3946D1818356800FDDAC9 /* AudacityLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28C3946B1818356800FDDAC9 /* AudacityLogger.cpp */; }; + 28CA9E6B1AE60C53005C0BFE /* dBTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82FF184D13CF01A600C1B664 /* dBTable.cpp */; }; + 28CA9E6C1AE60C53005C0BFE /* dBTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 82FF184E13CF01A600C1B664 /* dBTable.h */; }; + 28CA9E6D1AE60C53005C0BFE /* slide.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82FF184F13CF01A600C1B664 /* slide.cpp */; }; + 28CA9E6E1AE60C53005C0BFE /* sse.h in Headers */ = {isa = PBXBuildFile; fileRef = 82FF185013CF01A600C1B664 /* sse.h */; }; + 28CA9E6F1AE60C53005C0BFE /* synthTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 82FF185113CF01A600C1B664 /* synthTable.h */; }; + 28CA9E701AE60C53005C0BFE /* sincCoeffs.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707110EF9C51D007D4FFD /* sincCoeffs.h */; }; + 28CA9E711AE60C53005C0BFE /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707040EF9C51D007D4FFD /* buffer.cpp */; }; + 28CA9E721AE60C53005C0BFE /* buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707050EF9C51D007D4FFD /* buffer.h */; }; + 28CA9E731AE60C53005C0BFE /* fft.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707070EF9C51D007D4FFD /* fft.cpp */; }; + 28CA9E741AE60C53005C0BFE /* fft.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707080EF9C51D007D4FFD /* fft.h */; }; + 28CA9E751AE60C53005C0BFE /* grain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707090EF9C51D007D4FFD /* grain.cpp */; }; + 28CA9E761AE60C53005C0BFE /* grain.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27070A0EF9C51D007D4FFD /* grain.h */; }; + 28CA9E771AE60C53005C0BFE /* real.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27070E0EF9C51D007D4FFD /* real.h */; }; + 28CA9E781AE60C53005C0BFE /* resample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27070F0EF9C51D007D4FFD /* resample.cpp */; }; + 28CA9E791AE60C53005C0BFE /* sbsms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707100EF9C51D007D4FFD /* sbsms.cpp */; }; + 28CA9E7A1AE60C53005C0BFE /* sms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707120EF9C51D007D4FFD /* sms.cpp */; }; + 28CA9E7B1AE60C53005C0BFE /* sms.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707130EF9C51D007D4FFD /* sms.h */; }; + 28CA9E7C1AE60C53005C0BFE /* subband.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707140EF9C51D007D4FFD /* subband.cpp */; }; + 28CA9E7D1AE60C53005C0BFE /* subband.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707150EF9C51D007D4FFD /* subband.h */; }; + 28CA9E7E1AE60C53005C0BFE /* track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707160EF9C51D007D4FFD /* track.cpp */; }; + 28CA9E7F1AE60C53005C0BFE /* track.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707170EF9C51D007D4FFD /* track.h */; }; + 28CA9E801AE60C53005C0BFE /* trackpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707180EF9C51D007D4FFD /* trackpoint.cpp */; }; + 28CA9E811AE60C53005C0BFE /* trackpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707190EF9C51D007D4FFD /* trackpoint.h */; }; + 28CA9E821AE60C53005C0BFE /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27071B0EF9C51D007D4FFD /* utils.h */; }; 28CC03A81AD386CF00826380 /* phasevocoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 28CC03A01AD386CF00826380 /* phasevocoder.c */; }; 28CC03A91AD386CF00826380 /* phasevocoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 28CC03A11AD386CF00826380 /* phasevocoder.h */; }; 28CC03AA1AD386CF00826380 /* pvshell.c in Sources */ = {isa = PBXBuildFile; fileRef = 28CC03A21AD386CF00826380 /* pvshell.c */; }; @@ -1189,7 +1197,6 @@ 28F1D81F0A2D0019005506A7 /* ImageRoll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28F1D81B0A2D0019005506A7 /* ImageRoll.cpp */; }; 28F2CED4181867BB00573D61 /* numformatter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28F2CED0181867BB00573D61 /* numformatter.cpp */; }; 28F2CED5181867BB00573D61 /* valnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28F2CED2181867BB00573D61 /* valnum.cpp */; }; - 28F5C1110BE5886A00D17341 /* FileDialogPrivate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28F5C10F0BE5886A00D17341 /* FileDialogPrivate.cpp */; }; 28F67179197DFA1C00075C32 /* FormatClassifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28F67173197DFA1C00075C32 /* FormatClassifier.cpp */; }; 28F6717A197DFA1C00075C32 /* MultiFormatReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28F67175197DFA1C00075C32 /* MultiFormatReader.cpp */; }; 28F6717B197DFA1C00075C32 /* SpecPowerMeter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28F67177197DFA1C00075C32 /* SpecPowerMeter.cpp */; }; @@ -1212,13 +1219,9 @@ 28FC1AFB0A47762C00A188AE /* WrappedType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28FC1AF90A47762C00A188AE /* WrappedType.cpp */; }; 28FE4A080ABF4E960056F5C4 /* mmx_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28FE4A060ABF4E960056F5C4 /* mmx_optimized.cpp */; }; 28FE4A090ABF4E960056F5C4 /* sse_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28FE4A070ABF4E960056F5C4 /* sse_optimized.cpp */; }; - 28FE4A3A0ABF58360056F5C4 /* soundtouch_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 28FE4A390ABF58360056F5C4 /* soundtouch_config.h */; }; - 82FF185213CF01A600C1B664 /* dBTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82FF184D13CF01A600C1B664 /* dBTable.cpp */; }; - 82FF185313CF01A600C1B664 /* slide.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82FF184F13CF01A600C1B664 /* slide.cpp */; }; 8406A93812D0F2510011EA01 /* EQDefaultCurves.xml in Resources */ = {isa = PBXBuildFile; fileRef = 8406A93712D0F2510011EA01 /* EQDefaultCurves.xml */; }; 8484F31413086237002DF7F0 /* DeviceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8484F31213086237002DF7F0 /* DeviceManager.cpp */; }; ED15214D163C22F000451B5F /* lsr.c in Sources */ = {isa = PBXBuildFile; fileRef = ED152123163C220300451B5F /* lsr.c */; }; - ED152151163C232500451B5F /* soxr-config.h in Headers */ = {isa = PBXBuildFile; fileRef = ED152150163C232500451B5F /* soxr-config.h */; }; ED152161163C244200451B5F /* soxr.c in Sources */ = {isa = PBXBuildFile; fileRef = ED15215F163C244200451B5F /* soxr.c */; }; ED152162163C244200451B5F /* soxr.h in Headers */ = {isa = PBXBuildFile; fileRef = ED152160163C244200451B5F /* soxr.h */; }; ED15216C163C249500451B5F /* data-io.c in Sources */ = {isa = PBXBuildFile; fileRef = ED15216A163C249500451B5F /* data-io.c */; }; @@ -1236,25 +1239,6 @@ ED1521EB163C2B9000451B5F /* libsoxr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED152130163C227C00451B5F /* libsoxr.a */; }; ED19449A1733F92800F4F5CA /* Reverb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED1944981733F92800F4F5CA /* Reverb.cpp */; }; ED2706FF0EF9C47E007D4FFD /* sbsms.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2706FE0EF9C47E007D4FFD /* sbsms.h */; }; - ED2707260EF9C51D007D4FFD /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707040EF9C51D007D4FFD /* buffer.cpp */; }; - ED2707270EF9C51D007D4FFD /* buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707050EF9C51D007D4FFD /* buffer.h */; }; - ED2707290EF9C51D007D4FFD /* fft.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707070EF9C51D007D4FFD /* fft.cpp */; }; - ED27072A0EF9C51D007D4FFD /* fft.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707080EF9C51D007D4FFD /* fft.h */; }; - ED27072B0EF9C51D007D4FFD /* grain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707090EF9C51D007D4FFD /* grain.cpp */; }; - ED27072C0EF9C51D007D4FFD /* grain.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27070A0EF9C51D007D4FFD /* grain.h */; }; - ED2707300EF9C51D007D4FFD /* real.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27070E0EF9C51D007D4FFD /* real.h */; }; - ED2707310EF9C51D007D4FFD /* resample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27070F0EF9C51D007D4FFD /* resample.cpp */; }; - ED2707320EF9C51D007D4FFD /* sbsms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707100EF9C51D007D4FFD /* sbsms.cpp */; }; - ED2707330EF9C51D007D4FFD /* sincCoeffs.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707110EF9C51D007D4FFD /* sincCoeffs.h */; }; - ED2707340EF9C51D007D4FFD /* sms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707120EF9C51D007D4FFD /* sms.cpp */; }; - ED2707350EF9C51D007D4FFD /* sms.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707130EF9C51D007D4FFD /* sms.h */; }; - ED2707360EF9C51D007D4FFD /* subband.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707140EF9C51D007D4FFD /* subband.cpp */; }; - ED2707370EF9C51D007D4FFD /* subband.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707150EF9C51D007D4FFD /* subband.h */; }; - ED2707380EF9C51D007D4FFD /* track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707160EF9C51D007D4FFD /* track.cpp */; }; - ED2707390EF9C51D007D4FFD /* track.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707170EF9C51D007D4FFD /* track.h */; }; - ED27073A0EF9C51D007D4FFD /* trackpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED2707180EF9C51D007D4FFD /* trackpoint.cpp */; }; - ED27073B0EF9C51D007D4FFD /* trackpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = ED2707190EF9C51D007D4FFD /* trackpoint.h */; }; - ED27073D0EF9C51D007D4FFD /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = ED27071B0EF9C51D007D4FFD /* utils.h */; }; ED2707460EF9C550007D4FFD /* libsbsms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2706F40EF9C3C6007D4FFD /* libsbsms.a */; }; ED2707500EF9C64F007D4FFD /* SBSMSEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27074B0EF9C64F007D4FFD /* SBSMSEffect.cpp */; }; ED2707510EF9C64F007D4FFD /* TimeScale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED27074D0EF9C64F007D4FFD /* TimeScale.cpp */; }; @@ -1479,7 +1463,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 17048267098C0F5F00824C66 /* mad.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = mad.h; sourceTree = ""; tabWidth = 3; }; 17072F810988D6A9008541CC /* compat.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = compat.c; sourceTree = ""; tabWidth = 3; }; 17072F830988D6A9008541CC /* compat.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = compat.h; sourceTree = ""; tabWidth = 3; }; 17072F850988D6A9008541CC /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; tabWidth = 3; }; @@ -1519,7 +1502,6 @@ 17072FD00988D6A9008541CC /* version.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = ""; tabWidth = 3; }; 17072FE10988D6A9008541CC /* bit.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = bit.c; sourceTree = ""; tabWidth = 3; }; 17072FE20988D6A9008541CC /* bit.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = bit.h; sourceTree = ""; tabWidth = 3; }; - 17072FE50988D6A9008541CC /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; tabWidth = 3; }; 17072FF40988D6A9008541CC /* decoder.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = decoder.c; sourceTree = ""; tabWidth = 3; }; 17072FF50988D6A9008541CC /* decoder.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = decoder.h; sourceTree = ""; tabWidth = 3; }; 17072FF70988D6A9008541CC /* fixed.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = fixed.c; sourceTree = ""; tabWidth = 3; }; @@ -1541,8 +1523,6 @@ 170730260988D6A9008541CC /* timer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = timer.h; sourceTree = ""; tabWidth = 3; }; 170730290988D6A9008541CC /* version.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = version.c; sourceTree = ""; tabWidth = 3; }; 1707302A0988D6A9008541CC /* version.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = ""; tabWidth = 3; }; - 170731F30988D6AA008541CC /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; tabWidth = 3; }; - 170732F20988D6AB008541CC /* config_types.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = config_types.h; sourceTree = ""; tabWidth = 3; }; 170732F80988D6AB008541CC /* ogg.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = ogg.h; sourceTree = ""; tabWidth = 3; }; 170732F90988D6AB008541CC /* os_types.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = os_types.h; sourceTree = ""; tabWidth = 3; }; 170733980988D6AC008541CC /* bitwise.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = bitwise.c; sourceTree = ""; tabWidth = 3; }; @@ -1554,7 +1534,6 @@ 1707349D0988D6AD008541CC /* command.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = command.c; sourceTree = ""; tabWidth = 3; }; 1707349E0988D6AD008541CC /* common.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = common.c; sourceTree = ""; tabWidth = 3; }; 1707349F0988D6AD008541CC /* common.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; tabWidth = 3; }; - 170734A00988D6AD008541CC /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; tabWidth = 3; }; 170734A40988D6AD008541CC /* dither.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = dither.c; sourceTree = ""; tabWidth = 3; }; 170734A50988D6AD008541CC /* double64.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = double64.c; sourceTree = ""; tabWidth = 3; }; 170734A60988D6AD008541CC /* dwd.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = dwd.c; sourceTree = ""; tabWidth = 3; }; @@ -1570,7 +1549,6 @@ 170734BB0988D6AD008541CC /* g72x_priv.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = g72x_priv.h; sourceTree = ""; tabWidth = 3; }; 170734D20988D6AD008541CC /* add.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = add.c; sourceTree = ""; tabWidth = 3; }; 170734D40988D6AD008541CC /* code.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = code.c; sourceTree = ""; tabWidth = 3; }; - 170734D50988D6AD008541CC /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; tabWidth = 3; }; 170734D80988D6AD008541CC /* decode.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = decode.c; sourceTree = ""; tabWidth = 3; }; 170734D90988D6AD008541CC /* gsm.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = gsm.h; sourceTree = ""; tabWidth = 3; }; 170734DA0988D6AD008541CC /* gsm610_priv.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = gsm610_priv.h; sourceTree = ""; tabWidth = 3; }; @@ -1607,7 +1585,6 @@ 170735010988D6AD008541CC /* sf_unistd.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = sf_unistd.h; sourceTree = ""; tabWidth = 3; }; 170735020988D6AD008541CC /* sfendian.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = sfendian.h; sourceTree = ""; tabWidth = 3; }; 170735030988D6AD008541CC /* sndfile.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = sndfile.c; sourceTree = ""; tabWidth = 3; }; - 170735040988D6AD008541CC /* sndfile.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = sndfile.h; sourceTree = ""; tabWidth = 3; }; 170735070988D6AD008541CC /* strings.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = strings.c; sourceTree = ""; tabWidth = 3; }; 170735080988D6AD008541CC /* svx.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = svx.c; sourceTree = ""; tabWidth = 3; }; 170735100988D6AD008541CC /* txw.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = txw.c; sourceTree = ""; tabWidth = 3; }; @@ -1620,7 +1597,6 @@ 170735170988D6AD008541CC /* wav_w64.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = wav_w64.h; sourceTree = ""; tabWidth = 3; }; 170735180988D6AD008541CC /* wve.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = wve.c; sourceTree = ""; tabWidth = 3; }; 170735190988D6AD008541CC /* xi.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = xi.c; sourceTree = ""; tabWidth = 3; }; - 170735820988D6AD008541CC /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; tabWidth = 3; }; 1707363D0988D6AE008541CC /* codec.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = codec.h; sourceTree = ""; tabWidth = 3; }; 170736420988D6AE008541CC /* vorbisenc.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = vorbisenc.h; sourceTree = ""; tabWidth = 3; }; 170736430988D6AE008541CC /* vorbisfile.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = vorbisfile.h; sourceTree = ""; tabWidth = 3; }; @@ -1721,7 +1697,6 @@ 176EE9DB09A2EC1000188F3B /* caf.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = caf.c; sourceTree = ""; tabWidth = 3; }; 176EE9DC09A2EC1000188F3B /* flac.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = flac.c; sourceTree = ""; tabWidth = 3; }; 176EE9DD09A2EC1000188F3B /* g72x.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = g72x.c; sourceTree = ""; tabWidth = 3; }; - 176EE9F209A2EF1000188F3B /* config.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; tabWidth = 3; }; 176EEA1109A2EF1000188F3B /* callback.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = callback.h; sourceTree = ""; tabWidth = 3; }; 176EEA1209A2EF1000188F3B /* export.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = export.h; sourceTree = ""; tabWidth = 3; }; 176EEA1509A2EF1000188F3B /* format.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = format.h; sourceTree = ""; tabWidth = 3; }; @@ -2120,7 +2095,6 @@ 28105DA20AD09FC500BB4269 /* px_mixer.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = px_mixer.h; sourceTree = ""; tabWidth = 3; }; 2810644A1818EEB5004F678B /* cpu_detect_x86.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpu_detect_x86.cpp; sourceTree = ""; }; 2810644C1818EED3004F678B /* cpu_detect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cpu_detect.h; path = "../lib-src/soundtouch/source/SoundTouch/cpu_detect.h"; sourceTree = SOURCE_ROOT; }; - 28110FFF1AD4FDD8009FAC14 /* suil_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = suil_config.h; path = lv2/suil/build/suil_config.h; sourceTree = ""; }; 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug_Shared.xcconfig; sourceTree = ""; }; 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug_Static.xcconfig; sourceTree = ""; }; 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release_Shared.xcconfig; sourceTree = ""; }; @@ -2138,7 +2112,6 @@ 283135FE0DFBA2E80076D551 /* FFmpeg.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = FFmpeg.h; sourceTree = ""; tabWidth = 3; }; 283506280A3A88ED00EB1EBD /* pa_unix_util.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = pa_unix_util.c; sourceTree = ""; tabWidth = 3; }; 283506290A3A88ED00EB1EBD /* pa_unix_util.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = pa_unix_util.h; sourceTree = ""; tabWidth = 3; }; - 2835D8D01833D54100CF5EFF /* expat_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = expat_config.h; path = expat/expat_config.h; sourceTree = ""; }; 283A11A40A2C0DE7004372C4 /* broadcast.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = broadcast.c; sourceTree = ""; tabWidth = 3; }; 283A11A60A2C0E15004372C4 /* ShuttleGui.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = ShuttleGui.cpp; sourceTree = ""; tabWidth = 3; }; 283A11A70A2C0E15004372C4 /* ShuttleGui.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = ShuttleGui.h; sourceTree = ""; tabWidth = 3; }; @@ -2193,7 +2166,6 @@ 2840CF4A0AEB807E00F49FC3 /* twolame.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = twolame.h; path = twolame/libtwolame/twolame.h; sourceTree = ""; tabWidth = 3; }; 2840CF4B0AEB807E00F49FC3 /* util.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; name = util.c; path = twolame/libtwolame/util.c; sourceTree = ""; tabWidth = 3; }; 2840CF4C0AEB807E00F49FC3 /* util.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = util.h; path = twolame/libtwolame/util.h; sourceTree = ""; tabWidth = 3; }; - 2840CF790AEB810000F49FC3 /* config.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = config.h; path = twolame/build/config.h; sourceTree = ""; tabWidth = 3; }; 2840CF840AEB83DB00F49FC3 /* ExportMP2.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = ExportMP2.cpp; sourceTree = ""; tabWidth = 3; }; 2840CF850AEB83DB00F49FC3 /* ExportMP2.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = ExportMP2.h; sourceTree = ""; tabWidth = 3; }; 284249EA10D337CE004330A6 /* GetProjectInfoCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = GetProjectInfoCommand.cpp; sourceTree = ""; tabWidth = 3; }; @@ -2495,15 +2467,11 @@ 286229E6181CE62A00E1AD1A /* sord_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sord_internal.h; path = lv2/sord/src/sord_internal.h; sourceTree = ""; }; 286229E7181CE62A00E1AD1A /* sord.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sord.c; path = lv2/sord/src/sord.c; sourceTree = ""; }; 286229E8181CE62A00E1AD1A /* syntax.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = syntax.c; path = lv2/sord/src/syntax.c; sourceTree = ""; }; - 2862439F181CE65500E1AD1A /* sratom_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sratom_config.h; path = lv2/sratom/build/sratom_config.h; sourceTree = ""; }; 286243A0181CE65500E1AD1A /* sratom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sratom.h; path = lv2/sratom/sratom/sratom.h; sourceTree = ""; }; 286243A1181CE65500E1AD1A /* sratom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sratom.c; path = lv2/sratom/src/sratom.c; sourceTree = ""; }; 2862CECE1AD3900000A53194 /* test.lsp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = test.lsp; path = ../nyquist/test.lsp; sourceTree = SOURCE_ROOT; }; 2862CECF1AD3900000A53194 /* upic.sal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = upic.sal; path = ../nyquist/upic.sal; sourceTree = SOURCE_ROOT; }; 2862CED01AD3900000A53194 /* velocity.lsp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = velocity.lsp; path = ../nyquist/velocity.lsp; sourceTree = SOURCE_ROOT; }; - 28640873181CE74100CC4E2C /* sord_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sord_config.h; path = lv2/sord/build/sord_config.h; sourceTree = ""; }; - 28640875181CE75800CC4E2C /* serd_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = serd_config.h; path = lv2/serd/build/serd_config.h; sourceTree = ""; }; - 28640877181CE77200CC4E2C /* lilv_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lilv_config.h; path = lv2/lilv/build/lilv_config.h; sourceTree = ""; }; 287DBE830F3F6B2700C5BBED /* audio_detect.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = audio_detect.c; sourceTree = ""; tabWidth = 3; }; 287DBE840F3F6B2700C5BBED /* chunk.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = chunk.c; sourceTree = ""; tabWidth = 3; }; 287DBE850F3F6B2700C5BBED /* ima_oki_adpcm.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = ima_oki_adpcm.c; sourceTree = ""; tabWidth = 3; }; @@ -2989,7 +2957,6 @@ 28FC1AFA0A47762C00A188AE /* WrappedType.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = WrappedType.h; sourceTree = ""; tabWidth = 3; }; 28FE4A060ABF4E960056F5C4 /* mmx_optimized.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = mmx_optimized.cpp; sourceTree = ""; tabWidth = 3; }; 28FE4A070ABF4E960056F5C4 /* sse_optimized.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = sse_optimized.cpp; sourceTree = ""; tabWidth = 3; }; - 28FE4A390ABF58360056F5C4 /* soundtouch_config.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = soundtouch_config.h; path = "../lib-src/soundtouch/include/soundtouch_config.h"; sourceTree = SOURCE_ROOT; tabWidth = 3; }; 28FEC1B21A12B6FB00FACE48 /* EffectAutomationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EffectAutomationParameters.h; path = ../include/audacity/EffectAutomationParameters.h; sourceTree = SOURCE_ROOT; }; 82FF184D13CF01A600C1B664 /* dBTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dBTable.cpp; path = sbsms/src/dBTable.cpp; sourceTree = ""; }; 82FF184E13CF01A600C1B664 /* dBTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dBTable.h; path = sbsms/src/dBTable.h; sourceTree = ""; }; @@ -3019,7 +2986,6 @@ ED05D12A0E50AD5700CC4BD3 /* scorealign.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = scorealign.h; sourceTree = ""; tabWidth = 3; }; ED152123163C220300451B5F /* lsr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsr.c; sourceTree = ""; }; ED152130163C227C00451B5F /* libsoxr.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsoxr.a; sourceTree = BUILT_PRODUCTS_DIR; }; - ED152150163C232500451B5F /* soxr-config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "soxr-config.h"; path = "libsoxr/soxr-config.h"; sourceTree = ""; }; ED15215F163C244200451B5F /* soxr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = soxr.c; sourceTree = ""; }; ED152160163C244200451B5F /* soxr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = soxr.h; sourceTree = ""; }; ED15216A163C249500451B5F /* data-io.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "data-io.c"; sourceTree = ""; }; @@ -3242,7 +3208,6 @@ children = ( 17072FE10988D6A9008541CC /* bit.c */, 17072FE20988D6A9008541CC /* bit.h */, - 17072FE50988D6A9008541CC /* config.h */, 17072FF40988D6A9008541CC /* decoder.c */, 17072FF50988D6A9008541CC /* decoder.h */, 17072FF70988D6A9008541CC /* fixed.c */, @@ -3256,7 +3221,6 @@ 170730030988D6A9008541CC /* layer12.h */, 170730040988D6A9008541CC /* layer3.c */, 170730050988D6A9008541CC /* layer3.h */, - 17048267098C0F5F00824C66 /* mad.h */, 170730210988D6A9008541CC /* stream.c */, 170730220988D6A9008541CC /* stream.h */, 170730230988D6A9008541CC /* synth.c */, @@ -3274,7 +3238,6 @@ children = ( 170732EC0988D6AB008541CC /* include */, 170733920988D6AC008541CC /* src */, - 170731F30988D6AA008541CC /* config.h */, ); path = libogg; sourceTree = ""; @@ -3290,7 +3253,6 @@ 170732F10988D6AB008541CC /* ogg */ = { isa = PBXGroup; children = ( - 170732F20988D6AB008541CC /* config_types.h */, 170732F80988D6AB008541CC /* ogg.h */, 170732F90988D6AB008541CC /* os_types.h */, ); @@ -3332,7 +3294,6 @@ 1707349D0988D6AD008541CC /* command.c */, 1707349E0988D6AD008541CC /* common.c */, 1707349F0988D6AD008541CC /* common.h */, - 170734A00988D6AD008541CC /* config.h */, 170734A40988D6AD008541CC /* dither.c */, 170734A50988D6AD008541CC /* double64.c */, 170734A60988D6AD008541CC /* dwd.c */, @@ -3368,7 +3329,6 @@ 170735010988D6AD008541CC /* sf_unistd.h */, 170735020988D6AD008541CC /* sfendian.h */, 170735030988D6AD008541CC /* sndfile.c */, - 170735040988D6AD008541CC /* sndfile.h */, 170735070988D6AD008541CC /* strings.c */, 170735080988D6AD008541CC /* svx.c */, 170735100988D6AD008541CC /* txw.c */, @@ -3404,7 +3364,6 @@ children = ( 170734D20988D6AD008541CC /* add.c */, 170734D40988D6AD008541CC /* code.c */, - 170734D50988D6AD008541CC /* config.h */, 170734D80988D6AD008541CC /* decode.c */, 170734D90988D6AD008541CC /* gsm.h */, 170734DA0988D6AD008541CC /* gsm610_priv.h */, @@ -3428,7 +3387,6 @@ children = ( 170736370988D6AE008541CC /* include */, 170736450988D6AE008541CC /* lib */, - 170735820988D6AD008541CC /* config.h */, ); path = libvorbis; sourceTree = ""; @@ -3536,21 +3494,12 @@ 170737D30988D6AF008541CC /* soundtouch */ = { isa = PBXGroup; children = ( - 170737D60988D6AF008541CC /* config */, 170737EA0988D6AF008541CC /* include */, 170737FB0988D6AF008541CC /* source */, ); path = soundtouch; sourceTree = ""; }; - 170737D60988D6AF008541CC /* config */ = { - isa = PBXGroup; - children = ( - 28FE4A390ABF58360056F5C4 /* soundtouch_config.h */, - ); - path = config; - sourceTree = ""; - }; 170737EA0988D6AF008541CC /* include */ = { isa = PBXGroup; children = ( @@ -3676,7 +3625,6 @@ children = ( 176EEA0D09A2EF1000188F3B /* include */, 176EEA6B09A2EF1000188F3B /* src */, - 176EE9F209A2EF1000188F3B /* config.h */, ); path = libflac; sourceTree = ""; @@ -4531,7 +4479,6 @@ 2840CEC70AEB7E9D00F49FC3 /* twolame */ = { isa = PBXGroup; children = ( - 2840CF780AEB80CE00F49FC3 /* build */, 2840CECA0AEB7FA700F49FC3 /* libtwolame */, ); name = twolame; @@ -4586,14 +4533,6 @@ name = libtwolame; sourceTree = ""; }; - 2840CF780AEB80CE00F49FC3 /* build */ = { - isa = PBXGroup; - children = ( - 2840CF790AEB810000F49FC3 /* config.h */, - ); - name = build; - sourceTree = ""; - }; 2844B48E0DEA66900087C656 /* mod-script-pipe */ = { isa = PBXGroup; children = ( @@ -4607,7 +4546,6 @@ 2847504B1AD4EB41000AD751 /* suil */ = { isa = PBXGroup; children = ( - 28110FFF1AD4FDD8009FAC14 /* suil_config.h */, 284750611AD4EC28000AD751 /* suil.h */, 2847505B1AD4EBE1000AD751 /* host.c */, 2847505C1AD4EBE1000AD751 /* suil_instance.c */, @@ -5082,7 +5020,6 @@ 28622999181CE37800E1AD1A /* lilv */ = { isa = PBXGroup; children = ( - 28640877181CE77200CC4E2C /* lilv_config.h */, 286229B1181CE51800E1AD1A /* lilv.h */, 286229B2181CE51800E1AD1A /* collections.c */, 286229B3181CE51800E1AD1A /* instance.c */, @@ -5105,7 +5042,6 @@ 2862299A181CE3AE00E1AD1A /* serd */ = { isa = PBXGroup; children = ( - 28640875181CE75800CC4E2C /* serd_config.h */, 286229D5181CE5EC00E1AD1A /* serd.h */, 286229D6181CE5EC00E1AD1A /* env.c */, 286229D7181CE5EC00E1AD1A /* node.c */, @@ -5122,7 +5058,6 @@ isa = PBXGroup; children = ( 2847504C1AD4EB5A000AD751 /* zix */, - 28640873181CE74100CC4E2C /* sord_config.h */, 286229E5181CE62A00E1AD1A /* sord.h */, 286229E6181CE62A00E1AD1A /* sord_internal.h */, 286229E7181CE62A00E1AD1A /* sord.c */, @@ -5134,7 +5069,6 @@ 2862299C181CE3BA00E1AD1A /* sratom */ = { isa = PBXGroup; children = ( - 2862439F181CE65500E1AD1A /* sratom_config.h */, 286243A0181CE65500E1AD1A /* sratom.h */, 286243A1181CE65500E1AD1A /* sratom.c */, ); @@ -5521,7 +5455,6 @@ isa = PBXGroup; children = ( 28FADEDA1833C78C00BA4141 /* lib */, - 2835D8D01833D54100CF5EFF /* expat_config.h */, ); name = expat; sourceTree = ""; @@ -5586,7 +5519,6 @@ ED151F3F163BFD0400451B5F /* libsoxr */ = { isa = PBXGroup; children = ( - ED152150163C232500451B5F /* soxr-config.h */, ED151F4B163BFE9800451B5F /* src */, ); name = libsoxr; @@ -5721,7 +5653,6 @@ buildActionMask = 2147483647; files = ( 17073FC60988E577008541CC /* bit.h in Headers */, - 17073FC70988E577008541CC /* config.h in Headers */, 17073FC90988E577008541CC /* decoder.h in Headers */, 17073FCB0988E577008541CC /* fixed.h in Headers */, 17073FCD0988E577008541CC /* frame.h in Headers */, @@ -5733,7 +5664,6 @@ 17073FD80988E577008541CC /* synth.h in Headers */, 17073FDA0988E577008541CC /* timer.h in Headers */, 17073FDC0988E577008541CC /* version.h in Headers */, - 17048268098C0F5F00824C66 /* mad.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5741,8 +5671,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 17FDBCFE098BFF4E00BCEF32 /* config.h in Headers */, - 17FDBCFF098BFF4E00BCEF32 /* config_types.h in Headers */, 17FDBD00098BFF4E00BCEF32 /* ogg.h in Headers */, 17FDBD01098BFF4E00BCEF32 /* os_types.h in Headers */, ); @@ -5753,15 +5681,12 @@ buildActionMask = 2147483647; files = ( 170740270988EEBA008541CC /* common.h in Headers */, - 170740280988EEBA008541CC /* config.h in Headers */, 170740350988EEBA008541CC /* g72x.h in Headers */, 170740360988EEBA008541CC /* g72x_priv.h in Headers */, - 170740390988EEBA008541CC /* config.h in Headers */, 1707403B0988EEBA008541CC /* gsm.h in Headers */, 1707403C0988EEBA008541CC /* gsm610_priv.h in Headers */, 1707405B0988EEBA008541CC /* sf_unistd.h in Headers */, 1707405C0988EEBA008541CC /* sfendian.h in Headers */, - 1707405E0988EEBA008541CC /* sndfile.h in Headers */, 170740680988EEBA008541CC /* wav_w64.h in Headers */, 287DBE8C0F3F6B2700C5BBED /* ima_oki_adpcm.h in Headers */, 288A544C1346D1BA0050D774 /* chanmap.h in Headers */, @@ -5781,7 +5706,6 @@ 170740850988F1CC008541CC /* FIRFilter.h in Headers */, 170740880988F1CC008541CC /* RateTransposer.h in Headers */, 1707408B0988F1CC008541CC /* TDStretch.h in Headers */, - 28FE4A3A0ABF58360056F5C4 /* soundtouch_config.h in Headers */, 2810644D1818EED3004F678B /* cpu_detect.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -5799,7 +5723,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 170740D50988F835008541CC /* config.h in Headers */, 170740D60988F835008541CC /* codec.h in Headers */, 170740D70988F835008541CC /* vorbisenc.h in Headers */, 170740D80988F835008541CC /* vorbisfile.h in Headers */, @@ -6033,7 +5956,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 176EEC2809A2F30A00188F3B /* config.h in Headers */, 176EEC2B09A2F31300188F3B /* callback.h in Headers */, 176EEC2C09A2F31300188F3B /* export.h in Headers */, 176EEC2F09A2F31300188F3B /* format.h in Headers */, @@ -6048,7 +5970,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 176EEC2709A2F30800188F3B /* config.h in Headers */, 176EEC3709A2F31A00188F3B /* decoder.h in Headers */, 176EEC3809A2F31A00188F3B /* encoder.h in Headers */, 176EEC3909A2F31A00188F3B /* export.h in Headers */, @@ -6097,7 +6018,6 @@ 2840CF720AEB807E00F49FC3 /* subband.h in Headers */, 2840CF740AEB807E00F49FC3 /* twolame.h in Headers */, 2840CF760AEB807E00F49FC3 /* util.h in Headers */, - 2840CF7A0AEB810000F49FC3 /* config.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6118,18 +6038,13 @@ 286229E1181CE5EC00E1AD1A /* serd_internal.h in Headers */, 286229E9181CE62A00E1AD1A /* sord.h in Headers */, 286229EA181CE62A00E1AD1A /* sord_internal.h in Headers */, - 28624C0E181CE65700E1AD1A /* sratom_config.h in Headers */, 28624C0F181CE65700E1AD1A /* sratom.h in Headers */, - 28640874181CE74100CC4E2C /* sord_config.h in Headers */, - 28640876181CE75800CC4E2C /* serd_config.h in Headers */, - 28640878181CE77200CC4E2C /* lilv_config.h in Headers */, 284750541AD4EB84000AD751 /* common.h in Headers */, 284750561AD4EB84000AD751 /* digest.h in Headers */, 284750581AD4EB84000AD751 /* hash.h in Headers */, 2847505A1AD4EB84000AD751 /* tree.h in Headers */, 284750601AD4EBE1000AD751 /* suil_internal.h in Headers */, 284750621AD4EC28000AD751 /* suil.h in Headers */, - 281110001AD4FDD8009FAC14 /* suil_config.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6202,7 +6117,6 @@ 28FADF041833C78C00BA4141 /* xmlrole.h in Headers */, 28FADF061833C78C00BA4141 /* xmltok.h in Headers */, 28FADF081833C78C00BA4141 /* xmltok_impl.h in Headers */, - 2835D8D11833D54100CF5EFF /* expat_config.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6210,7 +6124,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - ED152151163C232500451B5F /* soxr-config.h in Headers */, ED152162163C244200451B5F /* soxr.h in Headers */, ED15216D163C249500451B5F /* data-io.h in Headers */, ED152177163C24D900451B5F /* rate.h in Headers */, @@ -6224,17 +6137,20 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 28CA9E701AE60C53005C0BFE /* sincCoeffs.h in Headers */, + 28CA9E811AE60C53005C0BFE /* trackpoint.h in Headers */, + 28CA9E821AE60C53005C0BFE /* utils.h in Headers */, + 28CA9E771AE60C53005C0BFE /* real.h in Headers */, + 28CA9E741AE60C53005C0BFE /* fft.h in Headers */, + 28CA9E6F1AE60C53005C0BFE /* synthTable.h in Headers */, + 28CA9E7B1AE60C53005C0BFE /* sms.h in Headers */, + 28CA9E721AE60C53005C0BFE /* buffer.h in Headers */, + 28CA9E7F1AE60C53005C0BFE /* track.h in Headers */, + 28CA9E6E1AE60C53005C0BFE /* sse.h in Headers */, ED2706FF0EF9C47E007D4FFD /* sbsms.h in Headers */, - ED2707270EF9C51D007D4FFD /* buffer.h in Headers */, - ED27072A0EF9C51D007D4FFD /* fft.h in Headers */, - ED27072C0EF9C51D007D4FFD /* grain.h in Headers */, - ED2707300EF9C51D007D4FFD /* real.h in Headers */, - ED2707330EF9C51D007D4FFD /* sincCoeffs.h in Headers */, - ED2707350EF9C51D007D4FFD /* sms.h in Headers */, - ED2707370EF9C51D007D4FFD /* subband.h in Headers */, - ED2707390EF9C51D007D4FFD /* track.h in Headers */, - ED27073B0EF9C51D007D4FFD /* trackpoint.h in Headers */, - ED27073D0EF9C51D007D4FFD /* utils.h in Headers */, + 28CA9E761AE60C53005C0BFE /* grain.h in Headers */, + 28CA9E6C1AE60C53005C0BFE /* dBTable.h in Headers */, + 28CA9E7D1AE60C53005C0BFE /* subband.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6314,7 +6230,6 @@ isa = PBXNativeTarget; buildConfigurationList = 17073FDD0988E584008541CC /* Build configuration list for PBXNativeTarget "libmad" */; buildPhases = ( - 17073FEB0988E6C9008541CC /* ShellScript */, 17073FC00988E561008541CC /* Headers */, 17073FC10988E561008541CC /* Sources */, ); @@ -6649,9 +6564,9 @@ productReference = ED152130163C227C00451B5F /* libsoxr.a */; productType = "com.apple.product-type.library.static"; }; - ED2706F30EF9C3C6007D4FFD /* libsbsms */ = { + ED2706F30EF9C3C6007D4FFD /* sbsms */ = { isa = PBXNativeTarget; - buildConfigurationList = ED2706F90EF9C3E4007D4FFD /* Build configuration list for PBXNativeTarget "libsbsms" */; + buildConfigurationList = ED2706F90EF9C3E4007D4FFD /* Build configuration list for PBXNativeTarget "sbsms" */; buildPhases = ( ED2706F00EF9C3C6007D4FFD /* Headers */, ED2706F10EF9C3C6007D4FFD /* Sources */, @@ -6660,7 +6575,7 @@ ); dependencies = ( ); - name = libsbsms; + name = sbsms; productName = libsbsms; productReference = ED2706F40EF9C3C6007D4FFD /* libsbsms.a */; productType = "com.apple.product-type.library.static"; @@ -6688,9 +6603,10 @@ 1790ABE309883346008A330A /* Project object */ = { isa = PBXProject; attributes = { + LastUpgradeCheck = 0630; }; - buildConfigurationList = 1790ABE409883346008A330A /* Build configuration list for PBXProject "Audacity" */; - compatibilityVersion = "Xcode 2.4"; + buildConfigurationList = 1790ABE409883346008A330A /* Build configuration list for PBXProject "Audacity_Xcode_5.1_with_10.6_sdk" */; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( @@ -6727,7 +6643,7 @@ 170740790988F1BB008541CC /* soundtouch */, 2840CECB0AEB803C00F49FC3 /* twolame */, 28E236F40E515D1D00281398 /* libscorealign */, - ED2706F30EF9C3C6007D4FFD /* libsbsms */, + ED2706F30EF9C3C6007D4FFD /* sbsms */, 2892CDC3131ADC6900E1E17D /* Manual */, 282413C6131D4E3F009FD931 /* Plugins */, ); @@ -6792,22 +6708,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "#\n# Make building on Lion or higher easier\n#\nexport CPP=cpp\nexport CC=gcc\nexport CXX=g++\nexport CPPFLAGS=\"-isysroot${SDKROOT}\"\nexport CFLAGS=\"-isysroot${SDKROOT}\"\nexport CXXFLAGS=\"-isysroot${SDKROOT}\"\n\nif [ -z \"$WX_CONFIG\" ]\nthen\n echo \"WX_CONFIG environment variable not set...aborting\"\n exit 1\nfi\n\nif [ ! -z \"${DYLD_LIBRARY_PATH}\" ]\nthen\n\techo \"warning: -----\"\n\techo \"warning: Warning:\"\n\techo \"warning: -----\"\n\techo \"warning: You have DYLD_LIBRARY_PATH set to '${DYLD_LIBRARY_PATH}'\"\n\techo \"warning: When you run or debug Audacity it will be unset so that libraries loaded by Audacity (like Lame or FFmpeg) will be searched for in a similar manner as in released versions.\"\n\techo \"warning: If this is a problem, copy the DYLD_LIBRARY_PATH value to DYLD_FALLBACK_LIBRARY_PATH before starting Xcode.\"\n\techo \"warning: -----\"\nfi\n\n#\n# Here we create empty xcconfig files if they do not exist. Otherwise,\n# the build will fail.\n#\nconfigs='Debug_Shared Debug_Static Release_Shared Release_Static'\nfor config in $configs\ndo\n\t[ ! -f $TOPLEVEL/mac/$config.xcconfig ] && touch $TOPLEVEL/mac/$config.xcconfig\ndone\n\n#\n# Get to a known location\n#\ncd $TOPLEVEL\n\n#\n# Libsndfile seems to have some date/time issues, so placate him.\n#\n# Run aclocal to make libsndfile happy\n#\n#touch lib-src/libsndfile/configure.ac\n\n#\n# Configure the world\nsh configure --enable-static=$CONFIG_STATIC \\\n --enable-unicode=$CONFIG_UNICODE \\\n --enable-debug=$CONFIG_DEBUG \\\n --with-lib-preference=local,system \\\n --with-wx-version=$WX_VER \\\n $CONFIG_FLAGS || exit 1\n\n#\n# Libsndfile's endianness detection is a bit unfriendly to universal binary\n# builds, so we coerce it into working our way.\n#\nFILE=lib-src/libsndfile/src/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <>$FILE\n#undef CPU_IS_BIG_ENDIAN\n#undef CPU_IS_LITTLE_ENDIAN\n#if defined(__BIG_ENDIAN__)\n#define CPU_IS_BIG_ENDIAN 1\n#define CPU_IS_LITTLE_ENDIAN 0\n#else\n#define CPU_IS_BIG_ENDIAN 0\n#define CPU_IS_LITTLE_ENDIAN 1\n#endif\nEOF\n\n#\n# Ditto for libflac.\n#\nFILE=lib-src/libflac/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <>$FILE\n#ifdef WORDS_BIGENDIAN\n#undef WORDS_BIGENDIAN\n#endif\n#if defined(__BIG_ENDIAN__)\n#define WORDS_BIGENDIAN 1\n#endif\nEOF\n\n#\n# And libmad.\n#\nFILE=lib-src/libmad/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <>$FILE\n#ifdef WORDS_BIGENDIAN\n#undef WORDS_BIGENDIAN\n#endif\n#if defined(__BIG_ENDIAN__)\n#define WORDS_BIGENDIAN 1\n#endif\nEOF\n\n#\n# And expat.\n#\nFILE=lib-src/expat/expat_config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <>$FILE\n#ifdef BYTEORDER\n#undef BYTEORDER\n#endif\n#if defined(__BIG_ENDIAN__)\n#define BYTEORDER 4321\n#else\n#define BYTEORDER 1234\n#endif\nEOF\n\n#\n# Libsoxr's endianness detection is a bit unfriendly to universal binary\n# builds. We need to disable SIMD since we can't build UBs with it enabled.\n#\nFILE=lib-src/libsoxr/soxr-config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <>$FILE\n#if defined(__BIG_ENDIAN__)\n#undef WORDS_BIGENDIAN\n#define WORDS_BIGENDIAN 1\n#endif\n#undef HAVE_SIMD\n#define HAVE_SIMD 0\nEOF\n\n#\n# Generate the header file for preprocessing the Info.plist\n#\ngcc -E -dM src/Audacity.h | grep AUDACITY >mac/Info.plist.h\necho >>mac/Info.plist.h '#define AUDACITY_EXECUTABLE Audacity'\n\nexit 0\n"; - }; - 17073FEB0988E6C9008541CC /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(TOPLEVEL)/lib-src/libmad/config.h", - ); - outputPaths = ( - "$(TOPLEVEL)/lib-src/libmad/mad.h", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "make -C $TOPLEVEL/lib-src/libmad mad.h\nexit $?\n"; + shellScript = "#\n# Make building on Lion or higher easier\n#\nexport CPP=cpp\nexport CC=gcc\nexport CXX=g++\nexport CPPFLAGS=\"-isysroot${SDKROOT}\"\nexport CFLAGS=\"-isysroot${SDKROOT}\"\nexport CXXFLAGS=\"-isysroot${SDKROOT}\"\n\nif [ -z \"$WX_CONFIG\" ]\nthen\n echo \"WX_CONFIG environment variable not set...aborting\"\n exit 1\nfi\n\nif [ ! -z \"${DYLD_LIBRARY_PATH}\" ]\nthen\n\techo \"warning: -----\"\n\techo \"warning: Warning:\"\n\techo \"warning: -----\"\n\techo \"warning: You have DYLD_LIBRARY_PATH set to '${DYLD_LIBRARY_PATH}'\"\n\techo \"warning: When you run or debug Audacity it will be unset so that libraries loaded by Audacity (like Lame or FFmpeg) will be searched for in a similar manner as in released versions.\"\n\techo \"warning: If this is a problem, copy the DYLD_LIBRARY_PATH value to DYLD_FALLBACK_LIBRARY_PATH before starting Xcode.\"\n\techo \"warning: -----\"\nfi\n\n#\n# Here we create empty xcconfig files if they do not exist. Otherwise,\n# the build will fail.\n#\nconfigs='Debug_Shared Debug_Static Release_Shared Release_Static'\nfor config in $configs\ndo\n\t[ ! -f $TOPLEVEL/mac/$config.xcconfig ] && touch $TOPLEVEL/mac/$config.xcconfig\ndone\n\n#\n# Get to a known location\n#\ncd $TOPLEVEL\n\nif false\nthen\n#\n# Libsndfile seems to have some date/time issues, so placate him.\n#\n# Run aclocal to make libsndfile happy\n#\n#touch lib-src/libsndfile/configure.ac\n\n#\n# Configure the world\nsh configure --enable-static=$CONFIG_STATIC \\\n --enable-unicode=$CONFIG_UNICODE \\\n --enable-debug=$CONFIG_DEBUG \\\n --with-lib-preference=local,system \\\n --with-wx-version=$WX_VER \\\n $CONFIG_FLAGS || exit 1\n\n#\n# Libsndfile's endianness detection is a bit unfriendly to universal binary\n# builds, so we coerce it into working our way.\n#\nFILE=lib-src/libsndfile/src/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <>$FILE\n#undef CPU_IS_BIG_ENDIAN\n#undef CPU_IS_LITTLE_ENDIAN\n#if defined(__BIG_ENDIAN__)\n#define CPU_IS_BIG_ENDIAN 1\n#define CPU_IS_LITTLE_ENDIAN 0\n#else\n#define CPU_IS_BIG_ENDIAN 0\n#define CPU_IS_LITTLE_ENDIAN 1\n#endif\nEOF\n\n#\n# Ditto for libflac.\n#\nFILE=lib-src/libflac/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <>$FILE\n#ifdef WORDS_BIGENDIAN\n#undef WORDS_BIGENDIAN\n#endif\n#if defined(__BIG_ENDIAN__)\n#define WORDS_BIGENDIAN 1\n#endif\nEOF\n\n#\n# And libmad.\n#\nFILE=lib-src/libmad/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <>$FILE\n#ifdef WORDS_BIGENDIAN\n#undef WORDS_BIGENDIAN\n#endif\n#if defined(__BIG_ENDIAN__)\n#define WORDS_BIGENDIAN 1\n#endif\nEOF\n\n#\n# And expat.\n#\nFILE=lib-src/expat/expat_config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <>$FILE\n#ifdef BYTEORDER\n#undef BYTEORDER\n#endif\n#if defined(__BIG_ENDIAN__)\n#define BYTEORDER 4321\n#else\n#define BYTEORDER 1234\n#endif\nEOF\n\n#\n# Libsoxr's endianness detection is a bit unfriendly to universal binary\n# builds. We need to disable SIMD since we can't build UBs with it enabled.\n#\nFILE=lib-src/libsoxr/soxr-config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <>$FILE\n#if defined(__BIG_ENDIAN__)\n#undef WORDS_BIGENDIAN\n#define WORDS_BIGENDIAN 1\n#endif\n#undef HAVE_SIMD\n#define HAVE_SIMD 0\nEOF\nfi\n\n#\n# Generate the header file for preprocessing the Info.plist\n#\ngcc -E -dM src/Audacity.h | grep AUDACITY >mac/Info.plist.h\necho >>mac/Info.plist.h '#define AUDACITY_EXECUTABLE Audacity'\n\nexit 0\n"; }; 28032560131DAFAF0059D002 /* Copy nyquist */ = { isa = PBXShellScriptBuildPhase; @@ -6853,7 +6754,7 @@ ); runOnlyForDeploymentPostprocessing = 1; shellPath = /bin/sh; - shellScript = "set -x\n\n# Setup\nVERSION=`awk '/^#define+ AUDACITY_VERSION / {print $3}' Info.plist.h`\nRELEASE=`awk '/^#define+ AUDACITY_RELEASE / {print $3}' Info.plist.h`\nREVISION=`awk '/^#define+ AUDACITY_REVISION / {print $3}' Info.plist.h`\nVERSION=$VERSION.$RELEASE.$REVISION\n\ncd \"${DSTROOT}\"\nchmod -RH \"${INSTALL_MODE_FLAG}\" \"${TARGET_BUILD_DIR}\"\nchown -RH \"${INSTALL_OWNER}:${INSTALL_GROUP}\" \"${TARGET_BUILD_DIR}\"\n\necho \"Audacity has been installed to: ${DSTROOT}\"\n\ncd ..\n\nVOL=\"Audacity $VERSION\"\nDMG=\"audacity-macosx-ub-$VERSION\"\n\n# Preclean\nrm -rf \"$DMG\" \"$DMG.dmg\" TMP.dmg\n\n# Create structure\nmkdir \"$DMG\"\ncp -pR \"${DSTROOT}/\" \"${DMG}\"\n\n#Add a custom icon for the DMG\n#cp -p mac/Resources/Audacity.icns \"${DMG}\"/.VolumeIcon.icns\n\n# Create and mount the image\nhdiutil create -ov -format UDRW -srcdir \"$DMG\" -fs HFS+ -volname \"$VOL\" TMP.dmg\n\n#Mount the DMG and store the name it was mounted with\nTITLE=`hdiutil attach TMP.dmg | grep \\/Volumes | sed \"s/^.*\\/Volumes\\///\"`\n\n#Set the custom icon flag\n#SetFile -a C /Volumes/\"$TITLE\"\n\n#Make our DMG look pretty and install the custom background image\necho '\n tell application \"Finder\"\n tell disk \"'${TITLE}'\"\n open\n set current view of container window to icon view\n set toolbar visible of container window to false\n set statusbar visible of container window to false\n set the bounds of container window to {400, 100, 1000, 550}\n set theViewOptions to the icon view options of container window\n set arrangement of theViewOptions to not arranged\n set icon size of theViewOptions to 72\n set background picture of theViewOptions to file \".background:Audacity-DMG-background.png\" \n make new alias file at container window to POSIX file \"/Applications\" with properties {name:\"Applications\"}\n set position of item \"Audacity\" of container window to {170, 350}\n set position of item \"Applications\" of container window to {430, 350}\n close\n open\n update without registering applications\n delay 5\n eject\n end tell\n end tell\n' | osascript\n\n# Compress and prepare for Internet delivery\nhdiutil convert TMP.dmg -format UDZO -imagekey zlib-level=9 -o \"$DMG.dmg\"\n\n# Create zip version\nrm -rf \"${DMG}/Audacity/help/\"\nzip -r9 \"${DMG}.zip\" \"${DMG}\"\n\n# Cleanup\nrm -rf ${DMG} TMP.dmg\n"; + shellScript = "set -x\n\n# Setup\nVERSION=`awk '/^#define+ AUDACITY_VERSION / {print $3}' Info.plist.h`\nRELEASE=`awk '/^#define+ AUDACITY_RELEASE / {print $3}' Info.plist.h`\nREVISION=`awk '/^#define+ AUDACITY_REVISION / {print $3}' Info.plist.h`\nVERSION=$VERSION.$RELEASE.$REVISION\n\ncd \"${DSTROOT}\"\nchmod -RH \"${INSTALL_MODE_FLAG}\" \"${TARGET_BUILD_DIR}\"\nchown -RH \"${INSTALL_OWNER}:${INSTALL_GROUP}\" \"${TARGET_BUILD_DIR}\"\n\necho \"Audacity has been installed to: ${DSTROOT}\"\n\ncd ..\n\nVOL=\"Audacity $VERSION\"\nDMG=\"audacity-macosx-$VERSION\"\n\n# Preclean\nrm -rf \"$DMG\" \"$DMG.dmg\" TMP.dmg\n\n# Create structure\nmkdir \"$DMG\"\ncp -pR \"${DSTROOT}/\" \"${DMG}\"\n\n#Add a custom icon for the DMG\n#cp -p mac/Resources/Audacity.icns \"${DMG}\"/.VolumeIcon.icns\n\n# Create and mount the image\nhdiutil create -ov -format UDRW -srcdir \"$DMG\" -fs HFS+ -volname \"$VOL\" TMP.dmg\n\n#Mount the DMG and store the name it was mounted with\nTITLE=`hdiutil attach TMP.dmg | grep \\/Volumes | sed \"s/^.*\\/Volumes\\///\"`\n\n#Set the custom icon flag\n#SetFile -a C /Volumes/\"$TITLE\"\n\n#Make our DMG look pretty and install the custom background image\necho '\n tell application \"Finder\"\n tell disk \"'${TITLE}'\"\n open\n set current view of container window to icon view\n set toolbar visible of container window to false\n set statusbar visible of container window to false\n set the bounds of container window to {400, 100, 1000, 550}\n set theViewOptions to the icon view options of container window\n set arrangement of theViewOptions to not arranged\n set icon size of theViewOptions to 72\n set background picture of theViewOptions to file \".background:Audacity-DMG-background.png\" \n make new alias file at container window to POSIX file \"/Applications\" with properties {name:\"Applications\"}\n set position of item \"Audacity\" of container window to {170, 350}\n set position of item \"Applications\" of container window to {430, 350}\n close\n open\n update without registering applications\n delay 5\n eject\n end tell\n end tell\n' | osascript\n\n# Compress and prepare for Internet delivery\nhdiutil convert TMP.dmg -format UDZO -imagekey zlib-level=9 -o \"$DMG.dmg\"\n\n# Create zip version\nrm -rf \"${DMG}/Audacity/help/\"\nzip -r9 \"${DMG}.zip\" \"${DMG}\"\n\n# Cleanup\nrm -rf ${DMG} TMP.dmg\n"; }; 282413DA131D52CE009FD931 /* Install plugins */ = { isa = PBXShellScriptBuildPhase; @@ -7446,6 +7347,7 @@ 1790B1A209883BFD008A330A /* ASlider.cpp in Sources */, 1790B1A309883BFD008A330A /* Meter.cpp in Sources */, 1790B1A409883BFD008A330A /* MultiDialog.cpp in Sources */, + 2867F1E81AE60CD900011DB5 /* FileDialogPrivate.cpp in Sources */, 1790B1A509883BFD008A330A /* Ruler.cpp in Sources */, 1790B1A709883BFD008A330A /* Warning.cpp in Sources */, 1790B1A909883BFD008A330A /* XMLFileReader.cpp in Sources */, @@ -7492,7 +7394,6 @@ 2816372E0BAE3B6C0079C746 /* LinkingHtmlWindow.cpp in Sources */, 283B3D4D0BC21EBE00FA01D5 /* FileDialog.cpp in Sources */, 2809C4B80BCB7E560006010F /* FileIO.cpp in Sources */, - 28F5C1110BE5886A00D17341 /* FileDialogPrivate.cpp in Sources */, 285DE1FA0BF03C7800A20DF0 /* Screenshot.cpp in Sources */, 2801A6460BF9268700648258 /* ImportQT.cpp in Sources */, 2891B2870C531D2C0044FBE3 /* FindClipping.cpp in Sources */, @@ -7626,8 +7527,6 @@ 28884971131B6CF600B59735 /* vi.po in Sources */, 28884972131B6CF600B59735 /* zh_TW.po in Sources */, 28884973131B6CF600B59735 /* zh.po in Sources */, - 82FF185213CF01A600C1B664 /* dBTable.cpp in Sources */, - 82FF185313CF01A600C1B664 /* slide.cpp in Sources */, EDF3B7B01588C0D50032D35F /* Paulstretch.cpp in Sources */, ED920CAF15B19F61008CA12C /* ModulePrefs.cpp in Sources */, EDD2431416934A6100D9DEC2 /* BassTreble.cpp in Sources */, @@ -7829,15 +7728,17 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - ED2707260EF9C51D007D4FFD /* buffer.cpp in Sources */, - ED2707290EF9C51D007D4FFD /* fft.cpp in Sources */, - ED27072B0EF9C51D007D4FFD /* grain.cpp in Sources */, - ED2707310EF9C51D007D4FFD /* resample.cpp in Sources */, - ED2707320EF9C51D007D4FFD /* sbsms.cpp in Sources */, - ED2707340EF9C51D007D4FFD /* sms.cpp in Sources */, - ED2707360EF9C51D007D4FFD /* subband.cpp in Sources */, - ED2707380EF9C51D007D4FFD /* track.cpp in Sources */, - ED27073A0EF9C51D007D4FFD /* trackpoint.cpp in Sources */, + 28CA9E751AE60C53005C0BFE /* grain.cpp in Sources */, + 28CA9E731AE60C53005C0BFE /* fft.cpp in Sources */, + 28CA9E801AE60C53005C0BFE /* trackpoint.cpp in Sources */, + 28CA9E711AE60C53005C0BFE /* buffer.cpp in Sources */, + 28CA9E7A1AE60C53005C0BFE /* sms.cpp in Sources */, + 28CA9E7C1AE60C53005C0BFE /* subband.cpp in Sources */, + 28CA9E7E1AE60C53005C0BFE /* track.cpp in Sources */, + 28CA9E6B1AE60C53005C0BFE /* dBTable.cpp in Sources */, + 28CA9E781AE60C53005C0BFE /* resample.cpp in Sources */, + 28CA9E791AE60C53005C0BFE /* sbsms.cpp in Sources */, + 28CA9E6D1AE60C53005C0BFE /* slide.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7954,7 +7855,7 @@ }; ED2707480EF9C55A007D4FFD /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = ED2706F30EF9C3C6007D4FFD /* libsbsms */; + target = ED2706F30EF9C3C6007D4FFD /* sbsms */; targetProxy = ED2707470EF9C55A007D4FFD /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -7964,6 +7865,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, FLAC__NO_ASM, @@ -7971,7 +7873,8 @@ NDEBUG, ); PRODUCT_NAME = FLAC; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libflac/src/libFLAC/include $(TOPLEVEL)/lib-src/libogg/include"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libflac/** $(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libflac/src/libFLAC/include $(TOPLEVEL)/mac/config/$(arch)/lib-src/libogg/** $(TOPLEVEL)/lib-src/libogg/include"; }; name = "Debug Static"; }; @@ -7979,13 +7882,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, NDEBUG, "FLaC__INLINE=__inline__", ); PRODUCT_NAME = "FLAC++"; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libflac/include"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libflac $(TOPLEVEL)/lib-src/libflac/include"; }; name = "Debug Static"; }; @@ -8001,7 +7906,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = portsmf; + SKIP_INSTALL = YES; }; name = "Debug Static"; }; @@ -8009,8 +7916,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; PRODUCT_NAME = id3tag; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libid3tag/** $(TOPLEVEL)/lib-src/libid3tag"; }; name = "Debug Static"; }; @@ -8018,11 +7928,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - HAVE_CONFIG_H, - FPM_PPC, - ); + COMBINE_HIDPI_IMAGES = YES; + GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; PRODUCT_NAME = mad; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libmad/** $(TOPLEVEL)/lib-src/libmad"; }; name = "Debug Static"; }; @@ -8030,14 +7940,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( CMTSTUFF, EXT, ); - HEADER_SEARCH_PATHS = ""; PRODUCT_NAME = nyquist; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/portaudio-v19/include $(TOPLEVEL)/lib-src/libsndfile/src $(TOPLEVEL)/lib-src/libnyquist $(TOPLEVEL)/lib-src/libnyquist/nyquist/cmt $(TOPLEVEL)/lib-src/libnyquist/nyquist/ffts/** $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqsrc $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk/include $(TOPLEVEL)/lib-src/libnyquist/nyquist/sys/unix $(TOPLEVEL)/lib-src/libnyquist/nyquist/tran $(TOPLEVEL)/lib-src/libnyquist/nyquist/xlisp"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/portaudio-v19/include $(TOPLEVEL)/mac/config/$(arch)/lib-src/libsndfile/** $(TOPLEVEL)/lib-src/libsndfile/src $(TOPLEVEL)/lib-src/libnyquist $(TOPLEVEL)/lib-src/libnyquist/nyquist/cmt $(TOPLEVEL)/lib-src/libnyquist/nyquist/ffts/** $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqsrc $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk/include $(TOPLEVEL)/lib-src/libnyquist/nyquist/sys/unix $(TOPLEVEL)/lib-src/libnyquist/nyquist/tran $(TOPLEVEL)/lib-src/libnyquist/nyquist/xlisp"; USE_HEADERMAP = ""; }; name = "Debug Static"; @@ -8046,7 +7957,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = ogg; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libogg/** $(TOPLEVEL)/lib-src/libogg/include"; }; name = "Debug Static"; }; @@ -8054,9 +7968,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; - HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; PRODUCT_NAME = sndfile; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libsndfile/**"; }; name = "Debug Static"; }; @@ -8064,13 +7980,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, DARWIN, USE_MEMORY_H, ); PRODUCT_NAME = vorbis; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libvorbis/lib $(TOPLEVEL)/lib-src/libogg/include"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libvorbis/** $(TOPLEVEL)/lib-src/libvorbis/lib $(TOPLEVEL)/mac/config/$(arch)/lib-src/libogg/** $(TOPLEVEL)/lib-src/libogg/include"; }; name = "Debug Static"; }; @@ -8078,8 +7996,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = "PX_USE_MAC_COREAUDIO=1"; PRODUCT_NAME = portmixer; + SKIP_INSTALL = YES; }; name = "Debug Static"; }; @@ -8087,8 +8007,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; PRODUCT_NAME = soundtouch; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/soundtouch/**"; }; name = "Debug Static"; }; @@ -8096,6 +8019,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", @@ -8153,7 +8077,7 @@ ); PRODUCT_NAME = Audacity; SKIP_INSTALL = NO; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac $(TOPLEVEL)/src/** $(TOPLEVEL)/lib-src/FileDialog $(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libid3tag $(TOPLEVEL)/lib-src/lame $(TOPLEVEL)/lib-src/libmad $(TOPLEVEL)/lib-src/libogg/include $(TOPLEVEL)/lib-src/libnyquist/nyq $(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)/lib-src/soundtouch/include $(TOPLEVEL)/lib-src/lv2/include $(TOPLEVEL)/lib-src/twolame/libtwolame"; + 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"; }; @@ -8176,7 +8100,7 @@ KEEP_PRIVATE_EXTERNS = YES; ONLY_LINK_ESSENTIAL_SYMBOLS = YES; SDKROOT = macosx10.6; - SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386 -Xarch_ppc -DAPPLE_PPC"; + SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386"; TOPLEVEL = ..; WX_CFLAGS = "-I$(WX_PREFIX)/lib/wx/include/mac-unicode-debug-static-$(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"; @@ -8191,28 +8115,36 @@ 2800FE080FF322D5005CA9E5 /* Debug Static */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = portmidi; + SKIP_INSTALL = YES; }; name = "Debug Static"; }; 2800FE090FF322D5005CA9E5 /* Debug Shared */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = portmidi; + SKIP_INSTALL = YES; }; name = "Debug Shared"; }; 2800FE0A0FF322D5005CA9E5 /* Release Static */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = portmidi; + SKIP_INSTALL = YES; }; name = "Release Static"; }; 2800FE0B0FF322D5005CA9E5 /* Release Shared */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = portmidi; + SKIP_INSTALL = YES; }; name = "Release Shared"; }; @@ -8248,9 +8180,12 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; PRODUCT_NAME = twolame; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/twolame/**"; }; name = "Debug Static"; }; @@ -8258,9 +8193,12 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; PRODUCT_NAME = twolame; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/twolame/**"; }; name = "Release Static"; }; @@ -8268,9 +8206,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libvamp"; PRODUCT_NAME = vamp; + SKIP_INSTALL = YES; }; name = "Debug Static"; }; @@ -8278,9 +8218,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libvamp"; PRODUCT_NAME = vamp; + SKIP_INSTALL = YES; }; name = "Release Static"; }; @@ -8288,18 +8230,26 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; HEADER_SEARCH_PATHS = ( - "$(TOPLEVEL)/lib-src/lv2/include", + "$(TOPLEVEL)/mac/config/$(arch)/lib-src/lv2/**", + "$(TOPLEVEL)/lib-src/lv2/lv2", + "$(TOPLEVEL)/lib-src/lv2/sord", "$(TOPLEVEL)/lib-src/lv2/sord/src/**", + "$(TOPLEVEL)/lib-src/lv2/lilv", "$(TOPLEVEL)/lib-src/lv2/lilv/src/**", + "$(TOPLEVEL)/lib-src/lv2/serd", "$(TOPLEVEL)/lib-src/lv2/serd/src/**", + "$(TOPLEVEL)/lib-src/lv2/sratom", "$(TOPLEVEL)/lib-src/lv2/sratom/src/**", + "$(TOPLEVEL)/lib-src/lv2/suil", "$(TOPLEVEL)/lib-src/lv2/suil/build/**", "$(TOPLEVEL)/lib-src/lv2/suil/src/**", ); PRODUCT_NAME = lv2; + SKIP_INSTALL = YES; }; name = "Debug Static"; }; @@ -8307,18 +8257,26 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; HEADER_SEARCH_PATHS = ( - "$(TOPLEVEL)/lib-src/lv2/include", + "$(TOPLEVEL)/mac/config/$(arch)/lib-src/lv2/**", + "$(TOPLEVEL)/lib-src/lv2/lv2", + "$(TOPLEVEL)/lib-src/lv2/sord", "$(TOPLEVEL)/lib-src/lv2/sord/src/**", + "$(TOPLEVEL)/lib-src/lv2/lilv", "$(TOPLEVEL)/lib-src/lv2/lilv/src/**", + "$(TOPLEVEL)/lib-src/lv2/serd", "$(TOPLEVEL)/lib-src/lv2/serd/src/**", + "$(TOPLEVEL)/lib-src/lv2/sratom", "$(TOPLEVEL)/lib-src/lv2/sratom/src/**", + "$(TOPLEVEL)/lib-src/lv2/suil", "$(TOPLEVEL)/lib-src/lv2/suil/build/**", "$(TOPLEVEL)/lib-src/lv2/suil/src/**", ); PRODUCT_NAME = lv2; + SKIP_INSTALL = YES; }; name = "Debug Shared"; }; @@ -8326,18 +8284,26 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; HEADER_SEARCH_PATHS = ( - "$(TOPLEVEL)/lib-src/lv2/include", + "$(TOPLEVEL)/mac/config/$(arch)/lib-src/lv2/**", + "$(TOPLEVEL)/lib-src/lv2/lv2", + "$(TOPLEVEL)/lib-src/lv2/sord", "$(TOPLEVEL)/lib-src/lv2/sord/src/**", + "$(TOPLEVEL)/lib-src/lv2/lilv", "$(TOPLEVEL)/lib-src/lv2/lilv/src/**", + "$(TOPLEVEL)/lib-src/lv2/serd", "$(TOPLEVEL)/lib-src/lv2/serd/src/**", + "$(TOPLEVEL)/lib-src/lv2/sratom", "$(TOPLEVEL)/lib-src/lv2/sratom/src/**", + "$(TOPLEVEL)/lib-src/lv2/suil", "$(TOPLEVEL)/lib-src/lv2/suil/build/**", "$(TOPLEVEL)/lib-src/lv2/suil/src/**", ); PRODUCT_NAME = lv2; + SKIP_INSTALL = YES; }; name = "Release Static"; }; @@ -8345,18 +8311,26 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; HEADER_SEARCH_PATHS = ( - "$(TOPLEVEL)/lib-src/lv2/include", + "$(TOPLEVEL)/mac/config/$(arch)/lib-src/lv2/**", + "$(TOPLEVEL)/lib-src/lv2/lv2", + "$(TOPLEVEL)/lib-src/lv2/sord", "$(TOPLEVEL)/lib-src/lv2/sord/src/**", + "$(TOPLEVEL)/lib-src/lv2/lilv", "$(TOPLEVEL)/lib-src/lv2/lilv/src/**", + "$(TOPLEVEL)/lib-src/lv2/serd", "$(TOPLEVEL)/lib-src/lv2/serd/src/**", + "$(TOPLEVEL)/lib-src/lv2/sratom", "$(TOPLEVEL)/lib-src/lv2/sratom/src/**", + "$(TOPLEVEL)/lib-src/lv2/suil", "$(TOPLEVEL)/lib-src/lv2/suil/build/**", "$(TOPLEVEL)/lib-src/lv2/suil/src/**", ); PRODUCT_NAME = lv2; + SKIP_INSTALL = YES; }; name = "Release Shared"; }; @@ -8364,6 +8338,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)/modules"; DYLIB_COMPATIBILITY_VERSION = ""; DYLIB_CURRENT_VERSION = ""; @@ -8395,6 +8370,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)/modules"; DYLIB_COMPATIBILITY_VERSION = ""; DYLIB_CURRENT_VERSION = ""; @@ -8443,7 +8419,7 @@ KEEP_PRIVATE_EXTERNS = YES; ONLY_LINK_ESSENTIAL_SYMBOLS = YES; SDKROOT = macosx10.6; - SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386 -Xarch_ppc -DAPPLE_PPC"; + SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386"; TOPLEVEL = ..; 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"; @@ -8459,6 +8435,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "BUILDING_AUDACITY=1", @@ -8514,7 +8491,7 @@ ); PRODUCT_NAME = Audacity; SKIP_INSTALL = NO; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac $(TOPLEVEL)/src/** $(TOPLEVEL)/lib-src/FileDialog $(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libid3tag $(TOPLEVEL)/lib-src/lame $(TOPLEVEL)/lib-src/libmad $(TOPLEVEL)/lib-src/libogg/include $(TOPLEVEL)/lib-src/libnyquist/nyq $(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)/lib-src/soundtouch/include $(TOPLEVEL)/lib-src/lv2/include $(TOPLEVEL)/lib-src/twolame/libtwolame"; + 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"; }; @@ -8530,7 +8507,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = portsmf; + SKIP_INSTALL = YES; }; name = "Debug Shared"; }; @@ -8538,6 +8517,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, FLAC__NO_ASM, @@ -8545,7 +8525,8 @@ NDEBUG, ); PRODUCT_NAME = FLAC; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libflac/src/libFLAC/include $(TOPLEVEL)/lib-src/libogg/include"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libflac/** $(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libflac/src/libFLAC/include $(TOPLEVEL)/mac/config/$(arch)/lib-src/libogg/** $(TOPLEVEL)/lib-src/libogg/include"; }; name = "Debug Shared"; }; @@ -8553,13 +8534,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, NDEBUG, "FLaC__INLINE=__inline__", ); PRODUCT_NAME = "FLAC++"; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libflac/include"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libflac $(TOPLEVEL)/lib-src/libflac/include"; }; name = "Debug Shared"; }; @@ -8567,8 +8550,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; PRODUCT_NAME = id3tag; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libid3tag/** $(TOPLEVEL)/lib-src/libid3tag"; }; name = "Debug Shared"; }; @@ -8576,11 +8562,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - HAVE_CONFIG_H, - FPM_PPC, - ); + COMBINE_HIDPI_IMAGES = YES; + GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; PRODUCT_NAME = mad; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libmad/** $(TOPLEVEL)/lib-src/libmad"; }; name = "Debug Shared"; }; @@ -8588,13 +8574,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( CMTSTUFF, EXT, ); PRODUCT_NAME = nyquist; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libnyquist $(TOPLEVEL)/lib-src/libnyquist/nyquist/cmt $(TOPLEVEL)/lib-src/libnyquist/nyquist/fft $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqsrc $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk/include $(TOPLEVEL)/lib-src/libnyquist/nyquist/sys/unix $(TOPLEVEL)/lib-src/libnyquist/nyquist/tran $(TOPLEVEL)/lib-src/libnyquist/nyquist/xlisp"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/portaudio-v19/include $(TOPLEVEL)/mac/config/$(arch)/lib-src/libsndfile/** $(TOPLEVEL)/lib-src/libsndfile/src $(TOPLEVEL)/lib-src/libnyquist $(TOPLEVEL)/lib-src/libnyquist/nyquist/cmt $(TOPLEVEL)/lib-src/libnyquist/nyquist/ffts/** $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqsrc $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk/include $(TOPLEVEL)/lib-src/libnyquist/nyquist/sys/unix $(TOPLEVEL)/lib-src/libnyquist/nyquist/tran $(TOPLEVEL)/lib-src/libnyquist/nyquist/xlisp"; }; name = "Debug Shared"; }; @@ -8602,13 +8590,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, DARWIN, USE_MEMORY_H, ); PRODUCT_NAME = vorbis; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libvorbis/lib $(TOPLEVEL)/lib-src/libogg/include"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libvorbis/** $(TOPLEVEL)/lib-src/libvorbis/lib $(TOPLEVEL)/mac/config/$(arch)/lib-src/libogg/** $(TOPLEVEL)/lib-src/libogg/include"; }; name = "Debug Shared"; }; @@ -8616,7 +8606,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = ogg; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libogg/** $(TOPLEVEL)/lib-src/libogg/include"; }; name = "Debug Shared"; }; @@ -8624,9 +8617,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; - HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; PRODUCT_NAME = sndfile; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libsndfile/**"; }; name = "Debug Shared"; }; @@ -8634,9 +8629,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libvamp"; PRODUCT_NAME = vamp; + SKIP_INSTALL = YES; }; name = "Debug Shared"; }; @@ -8644,6 +8641,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "STDC_HEADERS=1", "HAVE_SYS_TYPES_H=1", @@ -8664,6 +8662,7 @@ "PA_USE_COREAUDIO=1", ); PRODUCT_NAME = portaudio; + SKIP_INSTALL = YES; }; name = "Debug Shared"; }; @@ -8671,8 +8670,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = "PX_USE_MAC_COREAUDIO=1"; PRODUCT_NAME = portmixer; + SKIP_INSTALL = YES; }; name = "Debug Shared"; }; @@ -8680,8 +8681,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; PRODUCT_NAME = soundtouch; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/soundtouch/**"; }; name = "Debug Shared"; }; @@ -8689,9 +8693,12 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; PRODUCT_NAME = twolame; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/twolame/**"; }; name = "Debug Shared"; }; @@ -8699,6 +8706,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)/modules"; DYLIB_COMPATIBILITY_VERSION = ""; DYLIB_CURRENT_VERSION = ""; @@ -8747,7 +8755,7 @@ KEEP_PRIVATE_EXTERNS = YES; ONLY_LINK_ESSENTIAL_SYMBOLS = YES; SDKROOT = macosx10.6; - SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386 -Xarch_ppc -DAPPLE_PPC"; + SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386"; TOPLEVEL = ..; 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"; @@ -8763,6 +8771,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(TOPLEVEL)/src/AudacityHeaders.h"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -8820,7 +8829,7 @@ ); PRODUCT_NAME = Audacity; SKIP_INSTALL = NO; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac $(TOPLEVEL)/src/** $(TOPLEVEL)/lib-src/FileDialog $(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libid3tag $(TOPLEVEL)/lib-src/lame $(TOPLEVEL)/lib-src/libmad $(TOPLEVEL)/lib-src/libogg/include $(TOPLEVEL)/lib-src/libnyquist/nyq $(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)/lib-src/soundtouch/include $(TOPLEVEL)/lib-src/lv2/include $(TOPLEVEL)/lib-src/twolame/libtwolame"; + 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"; }; @@ -8836,7 +8845,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = portsmf; + SKIP_INSTALL = YES; }; name = "Release Shared"; }; @@ -8844,6 +8855,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, FLAC__NO_ASM, @@ -8851,7 +8863,8 @@ NDEBUG, ); PRODUCT_NAME = FLAC; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libflac/src/libFLAC/include $(TOPLEVEL)/lib-src/libogg/include"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libflac/** $(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libflac/src/libFLAC/include $(TOPLEVEL)/mac/config/$(arch)/lib-src/libogg/** $(TOPLEVEL)/lib-src/libogg/include"; }; name = "Release Shared"; }; @@ -8859,13 +8872,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, NDEBUG, "FLaC__INLINE=__inline__", ); PRODUCT_NAME = "FLAC++"; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libflac/include"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libflac $(TOPLEVEL)/lib-src/libflac/include"; }; name = "Release Shared"; }; @@ -8873,8 +8888,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; PRODUCT_NAME = id3tag; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libid3tag/** $(TOPLEVEL)/lib-src/libid3tag"; }; name = "Release Shared"; }; @@ -8882,11 +8900,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - HAVE_CONFIG_H, - FPM_PPC, - ); + COMBINE_HIDPI_IMAGES = YES; + GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; PRODUCT_NAME = mad; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libmad/** $(TOPLEVEL)/lib-src/libmad"; }; name = "Release Shared"; }; @@ -8894,13 +8912,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( CMTSTUFF, EXT, ); PRODUCT_NAME = nyquist; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libnyquist $(TOPLEVEL)/lib-src/libnyquist/nyquist/cmt $(TOPLEVEL)/lib-src/libnyquist/nyquist/fft $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqsrc $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk/include $(TOPLEVEL)/lib-src/libnyquist/nyquist/sys/unix $(TOPLEVEL)/lib-src/libnyquist/nyquist/tran $(TOPLEVEL)/lib-src/libnyquist/nyquist/xlisp"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/portaudio-v19/include $(TOPLEVEL)/mac/config/$(arch)/lib-src/libsndfile/** $(TOPLEVEL)/lib-src/libsndfile/src $(TOPLEVEL)/lib-src/libnyquist $(TOPLEVEL)/lib-src/libnyquist/nyquist/cmt $(TOPLEVEL)/lib-src/libnyquist/nyquist/ffts/** $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqsrc $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk/include $(TOPLEVEL)/lib-src/libnyquist/nyquist/sys/unix $(TOPLEVEL)/lib-src/libnyquist/nyquist/tran $(TOPLEVEL)/lib-src/libnyquist/nyquist/xlisp"; }; name = "Release Shared"; }; @@ -8908,13 +8928,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, DARWIN, USE_MEMORY_H, ); PRODUCT_NAME = vorbis; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libvorbis/lib $(TOPLEVEL)/lib-src/libogg/include"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libvorbis/** $(TOPLEVEL)/lib-src/libvorbis/lib $(TOPLEVEL)/mac/config/$(arch)/lib-src/libogg/** $(TOPLEVEL)/lib-src/libogg/include"; }; name = "Release Shared"; }; @@ -8922,7 +8944,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = ogg; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libogg/** $(TOPLEVEL)/lib-src/libogg/include"; }; name = "Release Shared"; }; @@ -8930,9 +8955,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; - HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; PRODUCT_NAME = sndfile; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libsndfile/**"; }; name = "Release Shared"; }; @@ -8940,9 +8967,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libvamp"; PRODUCT_NAME = vamp; + SKIP_INSTALL = YES; }; name = "Release Shared"; }; @@ -8950,6 +8979,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "STDC_HEADERS=1", "HAVE_SYS_TYPES_H=1", @@ -8970,6 +9000,7 @@ "PA_USE_COREAUDIO=1", ); PRODUCT_NAME = portaudio; + SKIP_INSTALL = YES; }; name = "Release Shared"; }; @@ -8977,8 +9008,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = "PX_USE_MAC_COREAUDIO=1"; PRODUCT_NAME = portmixer; + SKIP_INSTALL = YES; }; name = "Release Shared"; }; @@ -8986,8 +9019,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; PRODUCT_NAME = soundtouch; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/soundtouch/**"; }; name = "Release Shared"; }; @@ -8995,9 +9031,12 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; PRODUCT_NAME = twolame; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/twolame/**"; }; name = "Release Shared"; }; @@ -9005,6 +9044,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)/modules"; DYLIB_COMPATIBILITY_VERSION = ""; DYLIB_CURRENT_VERSION = ""; @@ -9064,7 +9104,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = scorealign; + SKIP_INSTALL = YES; }; name = "Debug Static"; }; @@ -9072,7 +9114,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = scorealign; + SKIP_INSTALL = YES; }; name = "Debug Shared"; }; @@ -9080,7 +9124,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = scorealign; + SKIP_INSTALL = YES; }; name = "Release Static"; }; @@ -9088,7 +9134,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = scorealign; + SKIP_INSTALL = YES; }; name = "Release Shared"; }; @@ -9104,7 +9152,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = portsmf; + SKIP_INSTALL = YES; }; name = "Release Static"; }; @@ -9112,6 +9162,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, FLAC__NO_ASM, @@ -9119,7 +9170,8 @@ NDEBUG, ); PRODUCT_NAME = FLAC; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libflac/src/libFLAC/include $(TOPLEVEL)/lib-src/libogg/include"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libflac/** $(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libflac/src/libFLAC/include $(TOPLEVEL)/mac/config/$(arch)/lib-src/libogg/** $(TOPLEVEL)/lib-src/libogg/include"; }; name = "Release Static"; }; @@ -9127,13 +9179,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, NDEBUG, "FLaC__INLINE=__inline__", ); PRODUCT_NAME = "FLAC++"; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libflac/include"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libflac $(TOPLEVEL)/lib-src/libflac/include"; }; name = "Release Static"; }; @@ -9141,8 +9195,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; PRODUCT_NAME = id3tag; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libid3tag/** $(TOPLEVEL)/lib-src/libid3tag"; }; name = "Release Static"; }; @@ -9150,11 +9207,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - HAVE_CONFIG_H, - FPM_PPC, - ); + COMBINE_HIDPI_IMAGES = YES; + GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; PRODUCT_NAME = mad; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libmad/** $(TOPLEVEL)/lib-src/libmad"; }; name = "Release Static"; }; @@ -9162,13 +9219,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( CMTSTUFF, EXT, ); PRODUCT_NAME = nyquist; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libnyquist $(TOPLEVEL)/lib-src/libnyquist/nyquist/cmt $(TOPLEVEL)/lib-src/libnyquist/nyquist/fft $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqsrc $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk/include $(TOPLEVEL)/lib-src/libnyquist/nyquist/sys/unix $(TOPLEVEL)/lib-src/libnyquist/nyquist/tran $(TOPLEVEL)/lib-src/libnyquist/nyquist/xlisp"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/portaudio-v19/include $(TOPLEVEL)/mac/config/$(arch)/lib-src/libsndfile/** $(TOPLEVEL)/lib-src/libsndfile/src $(TOPLEVEL)/lib-src/libnyquist $(TOPLEVEL)/lib-src/libnyquist/nyquist/cmt $(TOPLEVEL)/lib-src/libnyquist/nyquist/ffts/** $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqsrc $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk $(TOPLEVEL)/lib-src/libnyquist/nyquist/nyqstk/include $(TOPLEVEL)/lib-src/libnyquist/nyquist/sys/unix $(TOPLEVEL)/lib-src/libnyquist/nyquist/tran $(TOPLEVEL)/lib-src/libnyquist/nyquist/xlisp"; }; name = "Release Static"; }; @@ -9176,7 +9235,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; PRODUCT_NAME = ogg; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libogg/** $(TOPLEVEL)/lib-src/libogg/include"; }; name = "Release Static"; }; @@ -9184,9 +9246,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; - HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; PRODUCT_NAME = sndfile; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libsndfile/**"; }; name = "Release Static"; }; @@ -9194,13 +9258,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_CONFIG_H, DARWIN, USE_MEMORY_H, ); PRODUCT_NAME = vorbis; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/libvorbis/lib $(TOPLEVEL)/lib-src/libogg/include"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libvorbis/** $(TOPLEVEL)/lib-src/libvorbis/lib $(TOPLEVEL)/mac/config/$(arch)/lib-src/libogg/** $(TOPLEVEL)/lib-src/libogg/include"; }; name = "Release Static"; }; @@ -9208,6 +9274,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "STDC_HEADERS=1", "HAVE_SYS_TYPES_H=1", @@ -9228,6 +9295,7 @@ "PA_USE_COREAUDIO=1", ); PRODUCT_NAME = portaudio; + SKIP_INSTALL = YES; }; name = "Release Static"; }; @@ -9235,8 +9303,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = "PX_USE_MAC_COREAUDIO=1"; PRODUCT_NAME = portmixer; + SKIP_INSTALL = YES; }; name = "Release Static"; }; @@ -9244,8 +9314,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; PRODUCT_NAME = soundtouch; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/soundtouch/**"; }; name = "Release Static"; }; @@ -9253,6 +9326,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(TOPLEVEL)/src/AudacityHeaders.h"; @@ -9312,7 +9386,7 @@ ); PRODUCT_NAME = Audacity; SKIP_INSTALL = NO; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/include $(TOPLEVEL)/mac $(TOPLEVEL)/src/** $(TOPLEVEL)/lib-src/FileDialog $(TOPLEVEL)/lib-src/libflac/include $(TOPLEVEL)/lib-src/libid3tag $(TOPLEVEL)/lib-src/lame $(TOPLEVEL)/lib-src/libmad $(TOPLEVEL)/lib-src/libogg/include $(TOPLEVEL)/lib-src/libnyquist/nyq $(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)/lib-src/soundtouch/include $(TOPLEVEL)/lib-src/lv2/include $(TOPLEVEL)/lib-src/twolame/libtwolame"; + 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"; }; @@ -9335,7 +9409,7 @@ KEEP_PRIVATE_EXTERNS = YES; ONLY_LINK_ESSENTIAL_SYMBOLS = YES; SDKROOT = macosx10.6; - SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386 -Xarch_ppc -DAPPLE_PPC"; + SSE_CPPFLAGS = "-Xarch_i386 -DAPPLE_I386"; TOPLEVEL = ..; WX_CFLAGS = "-I$(WX_PREFIX)/lib/wx/include/mac-unicode-release-static-$(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"; @@ -9351,6 +9425,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "STDC_HEADERS=1", "HAVE_SYS_TYPES_H=1", @@ -9371,6 +9446,7 @@ "PA_USE_COREAUDIO=1", ); PRODUCT_NAME = portaudio; + SKIP_INSTALL = YES; }; name = "Debug Static"; }; @@ -9378,9 +9454,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_EXPAT_CONFIG_H; PRODUCT_NAME = expat; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/expat/lib"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/expat/** $(TOPLEVEL)/lib-src/expat/lib"; }; name = "Debug Static"; }; @@ -9388,9 +9466,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_EXPAT_CONFIG_H; PRODUCT_NAME = expat; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/expat/lib"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/expat/** $(TOPLEVEL)/lib-src/expat/lib"; }; name = "Debug Shared"; }; @@ -9398,9 +9478,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_EXPAT_CONFIG_H; PRODUCT_NAME = expat; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/expat/lib"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/expat/** $(TOPLEVEL)/lib-src/expat/lib"; }; name = "Release Static"; }; @@ -9408,57 +9490,67 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = HAVE_EXPAT_CONFIG_H; PRODUCT_NAME = expat; - USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/lib-src/expat/lib"; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/expat/** $(TOPLEVEL)/lib-src/expat/lib"; }; name = "Release Shared"; }; ED152131163C227C00451B5F /* Debug Static */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = SOXR_LIB; PREBINDING = NO; PRODUCT_NAME = soxr; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libsoxr/**"; }; name = "Debug Static"; }; ED152132163C227C00451B5F /* Debug Shared */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = SOXR_LIB; PREBINDING = NO; PRODUCT_NAME = soxr; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libsoxr/**"; }; name = "Debug Shared"; }; ED152133163C227C00451B5F /* Release Static */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = SOXR_LIB; PREBINDING = NO; PRODUCT_NAME = soxr; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libsoxr/**"; }; name = "Release Static"; }; ED152134163C227C00451B5F /* Release Shared */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = SOXR_LIB; PREBINDING = NO; PRODUCT_NAME = soxr; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/libsoxr/**"; }; name = "Release Shared"; }; @@ -9466,20 +9558,16 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; - OTHER_CFLAGS = ( - "$(SSE_CPPFLAGS)", - "$(WX_CFLAGS)", - ); - OTHER_CPLUSPLUSFLAGS = ( - "$(SSE_CPPFLAGS)", - "$(WX_CXXFLAGS)", - ); + OTHER_CFLAGS = "$(SSE_CPPFLAGS)"; + OTHER_CPLUSPLUSFLAGS = "$(SSE_CPPFLAGS)"; PREBINDING = NO; PRODUCT_NAME = sbsms; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/sbsms/**"; }; name = "Debug Static"; }; @@ -9487,20 +9575,16 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; - OTHER_CFLAGS = ( - "$(SSE_CPPFLAGS)", - "$(WX_CFLAGS)", - ); - OTHER_CPLUSPLUSFLAGS = ( - "$(SSE_CPPFLAGS)", - "$(WX_CXXFLAGS)", - ); + OTHER_CFLAGS = "$(SSE_CPPFLAGS)"; + OTHER_CPLUSPLUSFLAGS = "$(SSE_CPPFLAGS)"; PREBINDING = NO; PRODUCT_NAME = sbsms; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/sbsms/**"; }; name = "Debug Shared"; }; @@ -9508,20 +9592,16 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; - OTHER_CFLAGS = ( - "$(SSE_CPPFLAGS)", - "$(WX_CFLAGS)", - ); - OTHER_CPLUSPLUSFLAGS = ( - "$(SSE_CPPFLAGS)", - "$(WX_CXXFLAGS)", - ); + OTHER_CFLAGS = "$(SSE_CPPFLAGS)"; + OTHER_CPLUSPLUSFLAGS = "$(SSE_CPPFLAGS)"; PREBINDING = NO; PRODUCT_NAME = sbsms; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/sbsms/**"; }; name = "Release Static"; }; @@ -9529,20 +9609,16 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H; - OTHER_CFLAGS = ( - "$(SSE_CPPFLAGS)", - "$(WX_CFLAGS)", - ); - OTHER_CPLUSPLUSFLAGS = ( - "$(SSE_CPPFLAGS)", - "$(WX_CXXFLAGS)", - ); + OTHER_CFLAGS = "$(SSE_CPPFLAGS)"; + OTHER_CPLUSPLUSFLAGS = "$(SSE_CPPFLAGS)"; PREBINDING = NO; PRODUCT_NAME = sbsms; + SKIP_INSTALL = YES; + USER_HEADER_SEARCH_PATHS = "$(TOPLEVEL)/mac/config/$(arch)/lib-src/sbsms/**"; }; name = "Release Shared"; }; @@ -9550,6 +9626,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)/modules"; DYLIB_COMPATIBILITY_VERSION = ""; DYLIB_CURRENT_VERSION = ""; @@ -9587,6 +9664,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)/modules"; DYLIB_COMPATIBILITY_VERSION = ""; DYLIB_CURRENT_VERSION = ""; @@ -9624,6 +9702,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)/modules"; DYLIB_COMPATIBILITY_VERSION = ""; DYLIB_CURRENT_VERSION = ""; @@ -9661,6 +9740,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)/modules"; DYLIB_COMPATIBILITY_VERSION = ""; DYLIB_CURRENT_VERSION = ""; @@ -9829,7 +9909,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = "Debug Static"; }; - 1790ABE409883346008A330A /* Build configuration list for PBXProject "Audacity" */ = { + 1790ABE409883346008A330A /* Build configuration list for PBXProject "Audacity_Xcode_5.1_with_10.6_sdk" */ = { isa = XCConfigurationList; buildConfigurations = ( 17CAEBB6098C9B8E00337968 /* Debug Static */, @@ -9972,7 +10052,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = "Debug Static"; }; - ED2706F90EF9C3E4007D4FFD /* Build configuration list for PBXNativeTarget "libsbsms" */ = { + ED2706F90EF9C3E4007D4FFD /* Build configuration list for PBXNativeTarget "sbsms" */ = { isa = XCConfigurationList; buildConfigurations = ( ED2706F50EF9C3C6007D4FFD /* Debug Static */, diff --git a/mac/build_plugins.sh b/mac/build_plugins.sh index e7a2d38a7..dcdf83c7a 100755 --- a/mac/build_plugins.sh +++ b/mac/build_plugins.sh @@ -44,8 +44,15 @@ function build # Build the plugin if it doesn't exist if [ ! -e "${TARGET_BUILD_DIR}/${target}.so" ] then - echo "Building ${target}" - gcc-"${GCC_VERSION}" -bundle -arch ${ARCHS/ / -arch } \ + GCC=gcc + if [ -e "${GCC}-${GCC_VERSION}" ] + then + GCC="${GCC}-${GCC_VERSION}" + fi + + echo "Building ${target} using ${GCC}" + + "${GCC}" -bundle -arch ${ARCHS/ / -arch } \ -mmacosx-version-min="${MACOSX_DEPLOYMENT_TARGET}" -isysroot "${SDKROOT}" \ -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math \ "-D_init=__attribute__ ((constructor)) _${target}_init" \ diff --git a/mac/config.readme b/mac/config.readme new file mode 100644 index 000000000..e4d50808a --- /dev/null +++ b/mac/config.readme @@ -0,0 +1,6 @@ +The headers located in the config directory are updated +when libraries are added or updated in lib-src. + +Simply (re)run configure in the new/updated library directory +and copy any generated header files into the corresponding +directory in mac/config//lib-src. diff --git a/mac/config/i386/lib-src/expat/expat_config.h b/mac/config/i386/lib-src/expat/expat_config.h new file mode 100644 index 000000000..b72db602c --- /dev/null +++ b/mac/config/i386/lib-src/expat/expat_config.h @@ -0,0 +1,111 @@ +/* expat_config.h. Generated from expat_config.h.in by configure. */ +/* expat_config.h.in. Generated from configure.in by autoheader. */ + +/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ +#define BYTEORDER 1234 + +/* Define to 1 if you have the `bcopy' function. */ +#define HAVE_BCOPY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "expat-bugs@libexpat.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "expat" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "expat 2.1.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "expat" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "2.1.0" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* whether byteorder is bigendian */ +/* #undef WORDS_BIGENDIAN */ + +/* Define to specify how much context to retain around the current parse + point. */ +#define XML_CONTEXT_BYTES 1024 + +/* Define to make parameter entity parsing functionality available. */ +#define XML_DTD 1 + +/* Define to make XML Namespaces functionality available. */ +#define XML_NS 1 + +/* Define to __FUNCTION__ or "" if `__func__' does not conform to ANSI C. */ +/* #undef __func__ */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `long int' if does not define. */ +/* #undef off_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ +#ifdef BYTEORDER +#undef BYTEORDER +#endif +#if defined(__BIG_ENDIAN__) +#define BYTEORDER 4321 +#else +#define BYTEORDER 1234 +#endif diff --git a/mac/config/i386/lib-src/libflac/config.h b/mac/config/i386/lib-src/libflac/config.h new file mode 100644 index 000000000..1f0c10213 --- /dev/null +++ b/mac/config/i386/lib-src/libflac/config.h @@ -0,0 +1,238 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Target processor is big endian. */ +#define CPU_IS_BIG_ENDIAN 0 + +/* Target processor is little endian. */ +#define CPU_IS_LITTLE_ENDIAN 1 + +/* define to align allocated memory on 32-byte boundaries */ +/* #undef FLAC__ALIGN_MALLOC_DATA */ + +/* define if building for ia32/i386 */ +/* #undef FLAC__CPU_IA32 */ + +/* define if building for PowerPC */ +/* #undef FLAC__CPU_PPC */ + +/* define if building for PowerPC with SPE ABI */ +/* #undef FLAC__CPU_PPC_SPE */ + +/* define if building for SPARC */ +/* #undef FLAC__CPU_SPARC */ + +/* define if you are compiling for PowerPC and have the 'as' assembler */ +/* #undef FLAC__HAS_AS */ + +/* define if you have docbook-to-man or docbook2man */ +/* #undef FLAC__HAS_DOCBOOK_TO_MAN */ + +/* define if you are compiling for PowerPC and have the 'gas' assembler */ +#define FLAC__HAS_GAS 1 + +/* define if you are compiling for x86 and have the NASM assembler */ +#define FLAC__HAS_NASM 1 + +/* define if you have the ogg library */ +#define FLAC__HAS_OGG 1 + +/* define to disable use of assembly code */ +/* #undef FLAC__NO_ASM */ + +/* define if your operating system supports SSE instructions */ +/* #undef FLAC__SSE_OS */ + +/* define if building for Darwin / MacOS X */ +#define FLAC__SYS_DARWIN 1 + +/* define if building for Linux */ +/* #undef FLAC__SYS_LINUX */ + +/* define to enable use of 3Dnow! instructions */ +#define FLAC__USE_3DNOW 1 + +/* define to enable use of Altivec instructions */ +#define FLAC__USE_ALTIVEC 1 + +/* Define to 1 if `TIOCGWINSZ' requires . */ +/* #undef GWINSZ_IN_SYS_IOCTL */ + +/* Compiler has the __builtin_bswap32 intrinsic */ +#define HAVE_BSWAP32 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BYTESWAP_H */ + +/* Define to 1 if C++ supports variable-length arrays. */ +#define HAVE_CXX_VARARRAYS 1 + +/* Define to 1 if C supports variable-length arrays. */ +#define HAVE_C_VARARRAYS 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#define HAVE_FSEEKO 1 + +/* Define to 1 if you have the `getopt_long' function. */ +#define HAVE_GETOPT_LONG 1 + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define if you have and nl_langinfo(CODESET). */ +#define HAVE_LANGINFO_CODESET 1 + +/* lround support */ +#define HAVE_LROUND 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if the system has the type `socklen_t'. */ +/* #undef HAVE_SOCKLEN_T */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if typeof works with your compiler. */ +#define HAVE_TYPEOF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define as const if the declaration of iconv() needs const. */ +#define ICONV_CONST + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ + +/* Name of package */ +#define PACKAGE "flac" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "flac-dev@xiph.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "flac" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "flac 1.3.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "flac" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "https://www.xiph.org/flac/" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.3.0" + +/* The size of `off_t', as computed by sizeof. */ +#define SIZEOF_OFF_T 8 + +/* The size of `void*', as computed by sizeof. */ +#define SIZEOF_VOIDP 8 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif + + +/* Version number of package */ +#define VERSION "1.3.0" + +/* Target processor is big endian. */ +#define WORDS_BIGENDIAN 0 + +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +/* #undef _LARGEFILE_SOURCE */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +/* Define to 1 if on MINIX. */ +/* #undef _MINIX */ + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +/* #undef _POSIX_1_SOURCE */ + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +/* #undef _POSIX_SOURCE */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to __typeof__ if your compiler spells it that way. */ +/* #undef typeof */ +#ifdef WORDS_BIGENDIAN +#undef WORDS_BIGENDIAN +#endif +#if defined(__BIG_ENDIAN__) +#define WORDS_BIGENDIAN 1 +#endif diff --git a/mac/config/i386/lib-src/libid3tag/config.h b/mac/config/i386/lib-src/libid3tag/config.h new file mode 100644 index 000000000..331553b79 --- /dev/null +++ b/mac/config/i386/lib-src/libid3tag/config.h @@ -0,0 +1,87 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to enable diagnostic debugging support. */ +/* #undef DEBUG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ASSERT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the `ftruncate' function. */ +#define HAVE_FTRUNCATE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `z' library (-lz). */ +#define HAVE_LIBZ 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Define to disable debugging assertions. */ +/* #undef NDEBUG */ + +/* Name of package */ +#define PACKAGE "libid3tag" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "support@underbit.com" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "ID3 Tag" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "ID3 Tag 0.15.1b" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libid3tag" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.15.1b" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "0.15.1b" + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif diff --git a/mac/config/i386/lib-src/libmad/config.h b/mac/config/i386/lib-src/libmad/config.h new file mode 100644 index 000000000..f97c60c03 --- /dev/null +++ b/mac/config/i386/lib-src/libmad/config.h @@ -0,0 +1,215 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ +/* + * libmad - MPEG audio decoder library + * Copyright (C) 2000-2001 Robert Leslie + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id: acconfig.h,v 1.2 2001-10-21 22:26:32 dmazzoni Exp $ + */ + +# ifndef LIBMAD_CONFIG_H +# define LIBMAD_CONFIG_H + +/***************************************************************************** + * Definitions selected automatically by `configure' * + *****************************************************************************/ + +/* Define to optimize for speed over accuracy. */ +/* #undef OPT_SPEED */ + +/* Define to optimize for accuracy over speed. */ +/* #undef OPT_ACCURACY */ + +/* Define to enable a fast subband synthesis approximation optimization. */ +/* #undef OPT_SSO */ + +/* Define to influence a strict interpretation of the ISO/IEC standards, + even if this is in opposition with best accepted practices. */ +/* #undef OPT_STRICT */ + +/* Define if your MIPS CPU supports a 2-operand MADD instruction. */ +/* #undef HAVE_MADD_ASM */ + +/* Define if your MIPS CPU supports a 2-operand MADD16 instruction. */ +/* #undef HAVE_MADD16_ASM */ + +/* Define to enable diagnostic debugging support. */ +/* #undef DEBUG */ + +/* Define to disable debugging assertions. */ +/* #undef NDEBUG */ + +/* Define to enable experimental code. */ +/* #undef EXPERIMENTAL */ + + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Define to enable diagnostic debugging support. */ +/* #undef DEBUG */ + +/* Define to enable experimental code. */ +/* #undef EXPERIMENTAL */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ASSERT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the `fcntl' function. */ +#define HAVE_FCNTL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define if your MIPS CPU supports a 2-operand MADD16 instruction. */ +/* #undef HAVE_MADD16_ASM */ + +/* Define if your MIPS CPU supports a 2-operand MADD instruction. */ +/* #undef HAVE_MADD_ASM */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `pipe' function. */ +#define HAVE_PIPE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `waitpid' function. */ +#define HAVE_WAITPID 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Define to disable debugging assertions. */ +/* #undef NDEBUG */ + +/* Define to optimize for accuracy over speed. */ +/* #undef OPT_ACCURACY */ + +/* Define to optimize for speed over accuracy. */ +/* #undef OPT_SPEED */ + +/* Define to enable a fast subband synthesis approximation optimization. */ +/* #undef OPT_SSO */ + +/* Define to influence a strict interpretation of the ISO/IEC standards, even + if this is in opposition with best accepted practices. */ +/* #undef OPT_STRICT */ + +/* Name of package */ +#define PACKAGE "libmad" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "support@underbit.com" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "MPEG Audio Decoder" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "MPEG Audio Decoder 0.15.1b" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libmad" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.15.1b" + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 8 + +/* The size of `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "0.15.1b" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to `int' if does not define. */ +/* #undef pid_t */ +/***************************************************************************** + * End of automatically configured definitions * + *****************************************************************************/ + +# endif diff --git a/mac/config/i386/lib-src/libmad/mad.h b/mac/config/i386/lib-src/libmad/mad.h new file mode 100644 index 000000000..b14c5a6dc --- /dev/null +++ b/mac/config/i386/lib-src/libmad/mad.h @@ -0,0 +1,964 @@ +/* + * libmad - MPEG audio decoder library + * Copyright (C) 2000-2004 Underbit Technologies, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * If you would like to negotiate alternate licensing terms, you may do + * so by contacting: Underbit Technologies, Inc. + */ + +# ifdef __cplusplus +extern "C" { +# endif + +# define FPM_INTEL + + + +# define SIZEOF_INT 4 +# define SIZEOF_LONG 8 +# define SIZEOF_LONG_LONG 8 + + +/* Id: version.h,v 1.2 2005-09-12 07:01:30 dmazzoni Exp */ + +# ifndef LIBMAD_VERSION_H +# define LIBMAD_VERSION_H + +# define MAD_VERSION_MAJOR 0 +# define MAD_VERSION_MINOR 15 +# define MAD_VERSION_PATCH 1 +# define MAD_VERSION_EXTRA " (beta)" + +# define MAD_VERSION_STRINGIZE(str) #str +# define MAD_VERSION_STRING(num) MAD_VERSION_STRINGIZE(num) + +# define MAD_VERSION MAD_VERSION_STRING(MAD_VERSION_MAJOR) "." \ + MAD_VERSION_STRING(MAD_VERSION_MINOR) "." \ + MAD_VERSION_STRING(MAD_VERSION_PATCH) \ + MAD_VERSION_EXTRA + +# define MAD_PUBLISHYEAR "2000-2004" +# define MAD_AUTHOR "Underbit Technologies, Inc." +# define MAD_EMAIL "info@underbit.com" + +extern char const mad_version[]; +extern char const mad_copyright[]; +extern char const mad_author[]; +extern char const mad_build[]; + +# endif + +/* Id: fixed.h,v 1.3 2008-02-02 11:37:37 richardash1981 Exp */ + +# ifndef LIBMAD_FIXED_H +# define LIBMAD_FIXED_H + +# if SIZEOF_INT >= 4 +typedef signed int mad_fixed_t; + +typedef signed int mad_fixed64hi_t; +typedef unsigned int mad_fixed64lo_t; +# else +typedef signed long mad_fixed_t; + +typedef signed long mad_fixed64hi_t; +typedef unsigned long mad_fixed64lo_t; +# endif + +# if defined(_MSC_VER) +# define mad_fixed64_t signed __int64 +# elif 1 || defined(__GNUC__) +# define mad_fixed64_t signed long long +# endif + +# if defined(FPM_FLOAT) +typedef double mad_sample_t; +# else +typedef mad_fixed_t mad_sample_t; +# endif + +/* + * Fixed-point format: 0xABBBBBBB + * A == whole part (sign + 3 bits) + * B == fractional part (28 bits) + * + * Values are signed two's complement, so the effective range is: + * 0x80000000 to 0x7fffffff + * -8.0 to +7.9999999962747097015380859375 + * + * The smallest representable value is: + * 0x00000001 == 0.0000000037252902984619140625 (i.e. about 3.725e-9) + * + * 28 bits of fractional accuracy represent about + * 8.6 digits of decimal accuracy. + * + * Fixed-point numbers can be added or subtracted as normal + * integers, but multiplication requires shifting the 64-bit result + * from 56 fractional bits back to 28 (and rounding.) + * + * Changing the definition of MAD_F_FRACBITS is only partially + * supported, and must be done with care. + */ + +# define MAD_F_FRACBITS 28 + +# if MAD_F_FRACBITS == 28 +# define MAD_F(x) ((mad_fixed_t) (x##L)) +# else +# if MAD_F_FRACBITS < 28 +# warning "MAD_F_FRACBITS < 28" +# define MAD_F(x) ((mad_fixed_t) \ + (((x##L) + \ + (1L << (28 - MAD_F_FRACBITS - 1))) >> \ + (28 - MAD_F_FRACBITS))) +# elif MAD_F_FRACBITS > 28 +# error "MAD_F_FRACBITS > 28 not currently supported" +# define MAD_F(x) ((mad_fixed_t) \ + ((x##L) << (MAD_F_FRACBITS - 28))) +# endif +# endif + +# define MAD_F_MIN ((mad_fixed_t) -0x80000000L) +# define MAD_F_MAX ((mad_fixed_t) +0x7fffffffL) + +# define MAD_F_ONE MAD_F(0x10000000) + +# define mad_f_tofixed(x) ((mad_fixed_t) \ + ((x) * (double) (1L << MAD_F_FRACBITS) + 0.5)) +# define mad_f_todouble(x) ((double) \ + ((x) / (double) (1L << MAD_F_FRACBITS))) + +# define mad_f_intpart(x) ((x) >> MAD_F_FRACBITS) +# define mad_f_fracpart(x) ((x) & ((1L << MAD_F_FRACBITS) - 1)) + /* (x should be positive) */ + +# define mad_f_fromint(x) ((x) << MAD_F_FRACBITS) + +# define mad_f_add(x, y) ((x) + (y)) +# define mad_f_sub(x, y) ((x) - (y)) + +# if defined(FPM_FLOAT) +# error "FPM_FLOAT not yet supported" + +# undef MAD_F +# define MAD_F(x) mad_f_todouble(x) + +# define mad_f_mul(x, y) ((x) * (y)) +# define mad_f_scale64 + +# undef ASO_ZEROCHECK + +# elif defined(FPM_64BIT) + +/* + * This version should be the most accurate if 64-bit types are supported by + * the compiler, although it may not be the most efficient. + */ +# if defined(OPT_ACCURACY) +# define mad_f_mul(x, y) \ + ((mad_fixed_t) \ + ((((mad_fixed64_t) (x) * (y)) + \ + (1L << (MAD_F_SCALEBITS - 1))) >> MAD_F_SCALEBITS)) +# else +# define mad_f_mul(x, y) \ + ((mad_fixed_t) (((mad_fixed64_t) (x) * (y)) >> MAD_F_SCALEBITS)) +# endif + +# define MAD_F_SCALEBITS MAD_F_FRACBITS + +/* --- Intel --------------------------------------------------------------- */ + +# elif defined(FPM_INTEL) || defined (__i386__) + +# if defined(_MSC_VER) +# pragma warning(push) +# pragma warning(disable: 4035) /* no return value */ +static __forceinline +mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y) +{ + enum { + fracbits = MAD_F_FRACBITS + }; + + __asm { + mov eax, x + imul y + shrd eax, edx, fracbits + } + + /* implicit return of eax */ +} +# pragma warning(pop) + +# define mad_f_mul mad_f_mul_inline +# define mad_f_scale64 +# else +/* + * This Intel version is fast and accurate; the disposition of the least + * significant bit depends on OPT_ACCURACY via mad_f_scale64(). + */ +# define MAD_F_MLX(hi, lo, x, y) \ + asm ("imull %3" \ + : "=a" (lo), "=d" (hi) \ + : "%a" (x), "rm" (y) \ + : "cc") + +# if defined(OPT_ACCURACY) +/* + * This gives best accuracy but is not very fast. + */ +# define MAD_F_MLA(hi, lo, x, y) \ + ({ mad_fixed64hi_t __hi; \ + mad_fixed64lo_t __lo; \ + MAD_F_MLX(__hi, __lo, (x), (y)); \ + asm ("addl %2,%0\n\t" \ + "adcl %3,%1" \ + : "=rm" (lo), "=rm" (hi) \ + : "r" (__lo), "r" (__hi), "0" (lo), "1" (hi) \ + : "cc"); \ + }) +# endif /* OPT_ACCURACY */ + +# if defined(OPT_ACCURACY) +/* + * Surprisingly, this is faster than SHRD followed by ADC. + */ +# define mad_f_scale64(hi, lo) \ + ({ mad_fixed64hi_t __hi_; \ + mad_fixed64lo_t __lo_; \ + mad_fixed_t __result; \ + asm ("addl %4,%2\n\t" \ + "adcl %5,%3" \ + : "=rm" (__lo_), "=rm" (__hi_) \ + : "0" (lo), "1" (hi), \ + "ir" (1L << (MAD_F_SCALEBITS - 1)), "ir" (0) \ + : "cc"); \ + asm ("shrdl %3,%2,%1" \ + : "=rm" (__result) \ + : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS) \ + : "cc"); \ + __result; \ + }) +# elif defined(OPT_INTEL) +/* + * Alternate Intel scaling that may or may not perform better. + */ +# define mad_f_scale64(hi, lo) \ + ({ mad_fixed_t __result; \ + asm ("shrl %3,%1\n\t" \ + "shll %4,%2\n\t" \ + "orl %2,%1" \ + : "=rm" (__result) \ + : "0" (lo), "r" (hi), \ + "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS) \ + : "cc"); \ + __result; \ + }) +# else +# define mad_f_scale64(hi, lo) \ + ({ mad_fixed_t __result; \ + asm ("shrdl %3,%2,%1" \ + : "=rm" (__result) \ + : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS) \ + : "cc"); \ + __result; \ + }) +# endif /* OPT_ACCURACY */ + +# define MAD_F_SCALEBITS MAD_F_FRACBITS +# endif + +/* --- ARM ----------------------------------------------------------------- */ + +# elif defined(FPM_ARM) + +/* + * This ARM V4 version is as accurate as FPM_64BIT but much faster. The + * least significant bit is properly rounded at no CPU cycle cost! + */ +# if 1 +/* + * This is faster than the default implementation via MAD_F_MLX() and + * mad_f_scale64(). + */ +# define mad_f_mul(x, y) \ + ({ mad_fixed64hi_t __hi; \ + mad_fixed64lo_t __lo; \ + mad_fixed_t __result; \ + asm ("smull %0, %1, %3, %4\n\t" \ + "movs %0, %0, lsr %5\n\t" \ + "adc %2, %0, %1, lsl %6" \ + : "=&r" (__lo), "=&r" (__hi), "=r" (__result) \ + : "%r" (x), "r" (y), \ + "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS) \ + : "cc"); \ + __result; \ + }) +# endif + +# define MAD_F_MLX(hi, lo, x, y) \ + asm ("smull %0, %1, %2, %3" \ + : "=&r" (lo), "=&r" (hi) \ + : "%r" (x), "r" (y)) + +# define MAD_F_MLA(hi, lo, x, y) \ + asm ("smlal %0, %1, %2, %3" \ + : "+r" (lo), "+r" (hi) \ + : "%r" (x), "r" (y)) + +# define MAD_F_MLN(hi, lo) \ + asm ("rsbs %0, %2, #0\n\t" \ + "rsc %1, %3, #0" \ + : "=r" (lo), "=r" (hi) \ + : "0" (lo), "1" (hi) \ + : "cc") + +# define mad_f_scale64(hi, lo) \ + ({ mad_fixed_t __result; \ + asm ("movs %0, %1, lsr %3\n\t" \ + "adc %0, %0, %2, lsl %4" \ + : "=&r" (__result) \ + : "r" (lo), "r" (hi), \ + "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS) \ + : "cc"); \ + __result; \ + }) + +# define MAD_F_SCALEBITS MAD_F_FRACBITS + +/* --- MIPS ---------------------------------------------------------------- */ + +# elif defined(FPM_MIPS) + +/* + * This MIPS version is fast and accurate; the disposition of the least + * significant bit depends on OPT_ACCURACY via mad_f_scale64(). + */ +# define MAD_F_MLX(hi, lo, x, y) \ + asm ("mult %2,%3" \ + : "=l" (lo), "=h" (hi) \ + : "%r" (x), "r" (y)) + +# if defined(HAVE_MADD_ASM) +# define MAD_F_MLA(hi, lo, x, y) \ + asm ("madd %2,%3" \ + : "+l" (lo), "+h" (hi) \ + : "%r" (x), "r" (y)) +# elif defined(HAVE_MADD16_ASM) +/* + * This loses significant accuracy due to the 16-bit integer limit in the + * multiply/accumulate instruction. + */ +# define MAD_F_ML0(hi, lo, x, y) \ + asm ("mult %2,%3" \ + : "=l" (lo), "=h" (hi) \ + : "%r" ((x) >> 12), "r" ((y) >> 16)) +# define MAD_F_MLA(hi, lo, x, y) \ + asm ("madd16 %2,%3" \ + : "+l" (lo), "+h" (hi) \ + : "%r" ((x) >> 12), "r" ((y) >> 16)) +# define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo)) +# endif + +# if defined(OPT_SPEED) +# define mad_f_scale64(hi, lo) \ + ((mad_fixed_t) ((hi) << (32 - MAD_F_SCALEBITS))) +# define MAD_F_SCALEBITS MAD_F_FRACBITS +# endif + +/* --- SPARC --------------------------------------------------------------- */ + +# elif defined(FPM_SPARC) + +/* + * This SPARC V8 version is fast and accurate; the disposition of the least + * significant bit depends on OPT_ACCURACY via mad_f_scale64(). + */ +# define MAD_F_MLX(hi, lo, x, y) \ + asm ("smul %2, %3, %0\n\t" \ + "rd %%y, %1" \ + : "=r" (lo), "=r" (hi) \ + : "%r" (x), "rI" (y)) + +/* --- PowerPC ------------------------------------------------------------- */ + +# elif defined(FPM_PPC) || defined(__ppc__) + +/* + * This PowerPC version is fast and accurate; the disposition of the least + * significant bit depends on OPT_ACCURACY via mad_f_scale64(). + */ +# define MAD_F_MLX(hi, lo, x, y) \ + do { \ + asm ("mullw %0,%1,%2" \ + : "=r" (lo) \ + : "%r" (x), "r" (y)); \ + asm ("mulhw %0,%1,%2" \ + : "=r" (hi) \ + : "%r" (x), "r" (y)); \ + } \ + while (0) + +# if defined(OPT_ACCURACY) +/* + * This gives best accuracy but is not very fast. + */ +# define MAD_F_MLA(hi, lo, x, y) \ + ({ mad_fixed64hi_t __hi; \ + mad_fixed64lo_t __lo; \ + MAD_F_MLX(__hi, __lo, (x), (y)); \ + asm ("addc %0,%2,%3\n\t" \ + "adde %1,%4,%5" \ + : "=r" (lo), "=r" (hi) \ + : "%r" (lo), "r" (__lo), \ + "%r" (hi), "r" (__hi) \ + : "xer"); \ + }) +# endif + +# if defined(OPT_ACCURACY) +/* + * This is slower than the truncating version below it. + */ +# define mad_f_scale64(hi, lo) \ + ({ mad_fixed_t __result, __round; \ + asm ("rotrwi %0,%1,%2" \ + : "=r" (__result) \ + : "r" (lo), "i" (MAD_F_SCALEBITS)); \ + asm ("extrwi %0,%1,1,0" \ + : "=r" (__round) \ + : "r" (__result)); \ + asm ("insrwi %0,%1,%2,0" \ + : "+r" (__result) \ + : "r" (hi), "i" (MAD_F_SCALEBITS)); \ + asm ("add %0,%1,%2" \ + : "=r" (__result) \ + : "%r" (__result), "r" (__round)); \ + __result; \ + }) +# else +# define mad_f_scale64(hi, lo) \ + ({ mad_fixed_t __result; \ + asm ("rotrwi %0,%1,%2" \ + : "=r" (__result) \ + : "r" (lo), "i" (MAD_F_SCALEBITS)); \ + asm ("insrwi %0,%1,%2,0" \ + : "+r" (__result) \ + : "r" (hi), "i" (MAD_F_SCALEBITS)); \ + __result; \ + }) +# endif + +# define MAD_F_SCALEBITS MAD_F_FRACBITS + +/* --- Default ------------------------------------------------------------- */ + +# elif defined(FPM_DEFAULT) + +/* + * This version is the most portable but it loses significant accuracy. + * Furthermore, accuracy is biased against the second argument, so care + * should be taken when ordering operands. + * + * The scale factors are constant as this is not used with SSO. + * + * Pre-rounding is required to stay within the limits of compliance. + */ +# if defined(OPT_SPEED) +# define mad_f_mul(x, y) (((x) >> 12) * ((y) >> 16)) +# else +# define mad_f_mul(x, y) ((((x) + (1L << 11)) >> 12) * \ + (((y) + (1L << 15)) >> 16)) +# endif + +/* ------------------------------------------------------------------------- */ + +# else +# error "no FPM selected" +# endif + +/* default implementations */ + +# if !defined(mad_f_mul) +# define mad_f_mul(x, y) \ + ({ register mad_fixed64hi_t __hi; \ + register mad_fixed64lo_t __lo; \ + MAD_F_MLX(__hi, __lo, (x), (y)); \ + mad_f_scale64(__hi, __lo); \ + }) +# endif + +# if !defined(MAD_F_MLA) +# define MAD_F_ML0(hi, lo, x, y) ((lo) = mad_f_mul((x), (y))) +# define MAD_F_MLA(hi, lo, x, y) ((lo) += mad_f_mul((x), (y))) +# define MAD_F_MLN(hi, lo) ((lo) = -(lo)) +# define MAD_F_MLZ(hi, lo) ((void) (hi), (mad_fixed_t) (lo)) +# endif + +# if !defined(MAD_F_ML0) +# define MAD_F_ML0(hi, lo, x, y) MAD_F_MLX((hi), (lo), (x), (y)) +# endif + +# if !defined(MAD_F_MLN) +# define MAD_F_MLN(hi, lo) ((hi) = ((lo) = -(lo)) ? ~(hi) : -(hi)) +# endif + +# if !defined(MAD_F_MLZ) +# define MAD_F_MLZ(hi, lo) mad_f_scale64((hi), (lo)) +# endif + +# if !defined(mad_f_scale64) +# if defined(OPT_ACCURACY) +# define mad_f_scale64(hi, lo) \ + ((((mad_fixed_t) \ + (((hi) << (32 - (MAD_F_SCALEBITS - 1))) | \ + ((lo) >> (MAD_F_SCALEBITS - 1)))) + 1) >> 1) +# else +# define mad_f_scale64(hi, lo) \ + ((mad_fixed_t) \ + (((hi) << (32 - MAD_F_SCALEBITS)) | \ + ((lo) >> MAD_F_SCALEBITS))) +# endif +# define MAD_F_SCALEBITS MAD_F_FRACBITS +# endif + +/* C routines */ + +mad_fixed_t mad_f_abs(mad_fixed_t); +mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t); + +# endif + +/* Id: bit.h,v 1.2 2005-09-12 07:01:29 dmazzoni Exp */ + +# ifndef LIBMAD_BIT_H +# define LIBMAD_BIT_H + +struct mad_bitptr { + unsigned char const *byte; + unsigned short cache; + unsigned short left; +}; + +void mad_bit_init(struct mad_bitptr *, unsigned char const *); + +# define mad_bit_finish(bitptr) /* nothing */ + +unsigned int mad_bit_length(struct mad_bitptr const *, + struct mad_bitptr const *); + +# define mad_bit_bitsleft(bitptr) ((bitptr)->left) +unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *); + +void mad_bit_skip(struct mad_bitptr *, unsigned int); +unsigned long mad_bit_read(struct mad_bitptr *, unsigned int); +void mad_bit_write(struct mad_bitptr *, unsigned int, unsigned long); + +unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short); + +# endif + +/* Id: timer.h,v 1.2 2005-09-12 07:01:30 dmazzoni Exp */ + +# ifndef LIBMAD_TIMER_H +# define LIBMAD_TIMER_H + +typedef struct { + signed long seconds; /* whole seconds */ + unsigned long fraction; /* 1/MAD_TIMER_RESOLUTION seconds */ +} mad_timer_t; + +extern mad_timer_t const mad_timer_zero; + +# define MAD_TIMER_RESOLUTION 352800000UL + +enum mad_units { + MAD_UNITS_HOURS = -2, + MAD_UNITS_MINUTES = -1, + MAD_UNITS_SECONDS = 0, + + /* metric units */ + + MAD_UNITS_DECISECONDS = 10, + MAD_UNITS_CENTISECONDS = 100, + MAD_UNITS_MILLISECONDS = 1000, + + /* audio sample units */ + + MAD_UNITS_8000_HZ = 8000, + MAD_UNITS_11025_HZ = 11025, + MAD_UNITS_12000_HZ = 12000, + + MAD_UNITS_16000_HZ = 16000, + MAD_UNITS_22050_HZ = 22050, + MAD_UNITS_24000_HZ = 24000, + + MAD_UNITS_32000_HZ = 32000, + MAD_UNITS_44100_HZ = 44100, + MAD_UNITS_48000_HZ = 48000, + + /* video frame/field units */ + + MAD_UNITS_24_FPS = 24, + MAD_UNITS_25_FPS = 25, + MAD_UNITS_30_FPS = 30, + MAD_UNITS_48_FPS = 48, + MAD_UNITS_50_FPS = 50, + MAD_UNITS_60_FPS = 60, + + /* CD audio frames */ + + MAD_UNITS_75_FPS = 75, + + /* video drop-frame units */ + + MAD_UNITS_23_976_FPS = -24, + MAD_UNITS_24_975_FPS = -25, + MAD_UNITS_29_97_FPS = -30, + MAD_UNITS_47_952_FPS = -48, + MAD_UNITS_49_95_FPS = -50, + MAD_UNITS_59_94_FPS = -60 +}; + +# define mad_timer_reset(timer) ((void) (*(timer) = mad_timer_zero)) + +int mad_timer_compare(mad_timer_t, mad_timer_t); + +# define mad_timer_sign(timer) mad_timer_compare((timer), mad_timer_zero) + +void mad_timer_negate(mad_timer_t *); +mad_timer_t mad_timer_abs(mad_timer_t); + +void mad_timer_set(mad_timer_t *, unsigned long, unsigned long, unsigned long); +void mad_timer_add(mad_timer_t *, mad_timer_t); +void mad_timer_multiply(mad_timer_t *, signed long); + +signed long mad_timer_count(mad_timer_t, enum mad_units); +unsigned long mad_timer_fraction(mad_timer_t, unsigned long); +void mad_timer_string(mad_timer_t, char *, char const *, + enum mad_units, enum mad_units, unsigned long); + +# endif + +/* Id: stream.h,v 1.2 2005-09-12 07:01:30 dmazzoni Exp */ + +# ifndef LIBMAD_STREAM_H +# define LIBMAD_STREAM_H + + +# define MAD_BUFFER_GUARD 8 +# define MAD_BUFFER_MDLEN (511 + 2048 + MAD_BUFFER_GUARD) + +enum mad_error { + MAD_ERROR_NONE = 0x0000, /* no error */ + + MAD_ERROR_BUFLEN = 0x0001, /* input buffer too small (or EOF) */ + MAD_ERROR_BUFPTR = 0x0002, /* invalid (null) buffer pointer */ + + MAD_ERROR_NOMEM = 0x0031, /* not enough memory */ + + MAD_ERROR_LOSTSYNC = 0x0101, /* lost synchronization */ + MAD_ERROR_BADLAYER = 0x0102, /* reserved header layer value */ + MAD_ERROR_BADBITRATE = 0x0103, /* forbidden bitrate value */ + MAD_ERROR_BADSAMPLERATE = 0x0104, /* reserved sample frequency value */ + MAD_ERROR_BADEMPHASIS = 0x0105, /* reserved emphasis value */ + + MAD_ERROR_BADCRC = 0x0201, /* CRC check failed */ + MAD_ERROR_BADBITALLOC = 0x0211, /* forbidden bit allocation value */ + MAD_ERROR_BADSCALEFACTOR = 0x0221, /* bad scalefactor index */ + MAD_ERROR_BADMODE = 0x0222, /* bad bitrate/mode combination */ + MAD_ERROR_BADFRAMELEN = 0x0231, /* bad frame length */ + MAD_ERROR_BADBIGVALUES = 0x0232, /* bad big_values count */ + MAD_ERROR_BADBLOCKTYPE = 0x0233, /* reserved block_type */ + MAD_ERROR_BADSCFSI = 0x0234, /* bad scalefactor selection info */ + MAD_ERROR_BADDATAPTR = 0x0235, /* bad main_data_begin pointer */ + MAD_ERROR_BADPART3LEN = 0x0236, /* bad audio data length */ + MAD_ERROR_BADHUFFTABLE = 0x0237, /* bad Huffman table select */ + MAD_ERROR_BADHUFFDATA = 0x0238, /* Huffman data overrun */ + MAD_ERROR_BADSTEREO = 0x0239 /* incompatible block_type for JS */ +}; + +# define MAD_RECOVERABLE(error) ((error) & 0xff00) + +struct mad_stream { + unsigned char const *buffer; /* input bitstream buffer */ + unsigned char const *bufend; /* end of buffer */ + unsigned long skiplen; /* bytes to skip before next frame */ + + int sync; /* stream sync found */ + unsigned long freerate; /* free bitrate (fixed) */ + + unsigned char const *this_frame; /* start of current frame */ + unsigned char const *next_frame; /* start of next frame */ + struct mad_bitptr ptr; /* current processing bit pointer */ + + struct mad_bitptr anc_ptr; /* ancillary bits pointer */ + unsigned int anc_bitlen; /* number of ancillary bits */ + + unsigned char (*main_data)[MAD_BUFFER_MDLEN]; + /* Layer III main_data() */ + unsigned int md_len; /* bytes in main_data */ + + int options; /* decoding options (see below) */ + enum mad_error error; /* error code (see above) */ +}; + +enum { + MAD_OPTION_IGNORECRC = 0x0001, /* ignore CRC errors */ + MAD_OPTION_HALFSAMPLERATE = 0x0002 /* generate PCM at 1/2 sample rate */ +# if 0 /* not yet implemented */ + MAD_OPTION_LEFTCHANNEL = 0x0010, /* decode left channel only */ + MAD_OPTION_RIGHTCHANNEL = 0x0020, /* decode right channel only */ + MAD_OPTION_SINGLECHANNEL = 0x0030 /* combine channels */ +# endif +}; + +void mad_stream_init(struct mad_stream *); +void mad_stream_finish(struct mad_stream *); + +# define mad_stream_options(stream, opts) \ + ((void) ((stream)->options = (opts))) + +void mad_stream_buffer(struct mad_stream *, + unsigned char const *, unsigned long); +void mad_stream_skip(struct mad_stream *, unsigned long); + +int mad_stream_sync(struct mad_stream *); + +char const *mad_stream_errorstr(struct mad_stream const *); + +# endif + +/* Id: frame.h,v 1.2 2005-09-12 07:01:30 dmazzoni Exp */ + +# ifndef LIBMAD_FRAME_H +# define LIBMAD_FRAME_H + + +enum mad_layer { + MAD_LAYER_I = 1, /* Layer I */ + MAD_LAYER_II = 2, /* Layer II */ + MAD_LAYER_III = 3 /* Layer III */ +}; + +enum mad_mode { + MAD_MODE_SINGLE_CHANNEL = 0, /* single channel */ + MAD_MODE_DUAL_CHANNEL = 1, /* dual channel */ + MAD_MODE_JOINT_STEREO = 2, /* joint (MS/intensity) stereo */ + MAD_MODE_STEREO = 3 /* normal LR stereo */ +}; + +enum mad_emphasis { + MAD_EMPHASIS_NONE = 0, /* no emphasis */ + MAD_EMPHASIS_50_15_US = 1, /* 50/15 microseconds emphasis */ + MAD_EMPHASIS_CCITT_J_17 = 3, /* CCITT J.17 emphasis */ + MAD_EMPHASIS_RESERVED = 2 /* unknown emphasis */ +}; + +struct mad_header { + enum mad_layer layer; /* audio layer (1, 2, or 3) */ + enum mad_mode mode; /* channel mode (see above) */ + int mode_extension; /* additional mode info */ + enum mad_emphasis emphasis; /* de-emphasis to use (see above) */ + + unsigned long bitrate; /* stream bitrate (bps) */ + unsigned int samplerate; /* sampling frequency (Hz) */ + + unsigned short crc_check; /* frame CRC accumulator */ + unsigned short crc_target; /* final target CRC checksum */ + + int flags; /* flags (see below) */ + int private_bits; /* private bits (see below) */ + + mad_timer_t duration; /* audio playing time of frame */ +}; + +struct mad_frame { + struct mad_header header; /* MPEG audio header */ + + int options; /* decoding options (from stream) */ + + mad_fixed_t sbsample[2][36][32]; /* synthesis subband filter samples */ + mad_fixed_t (*overlap)[2][32][18]; /* Layer III block overlap data */ +}; + +# define MAD_NCHANNELS(header) ((header)->mode ? 2 : 1) +# define MAD_NSBSAMPLES(header) \ + ((header)->layer == MAD_LAYER_I ? 12 : \ + (((header)->layer == MAD_LAYER_III && \ + ((header)->flags & MAD_FLAG_LSF_EXT)) ? 18 : 36)) + +enum { + MAD_FLAG_NPRIVATE_III = 0x0007, /* number of Layer III private bits */ + MAD_FLAG_INCOMPLETE = 0x0008, /* header but not data is decoded */ + + MAD_FLAG_PROTECTION = 0x0010, /* frame has CRC protection */ + MAD_FLAG_COPYRIGHT = 0x0020, /* frame is copyright */ + MAD_FLAG_ORIGINAL = 0x0040, /* frame is original (else copy) */ + MAD_FLAG_PADDING = 0x0080, /* frame has additional slot */ + + MAD_FLAG_I_STEREO = 0x0100, /* uses intensity joint stereo */ + MAD_FLAG_MS_STEREO = 0x0200, /* uses middle/side joint stereo */ + MAD_FLAG_FREEFORMAT = 0x0400, /* uses free format bitrate */ + + MAD_FLAG_LSF_EXT = 0x1000, /* lower sampling freq. extension */ + MAD_FLAG_MC_EXT = 0x2000, /* multichannel audio extension */ + MAD_FLAG_MPEG_2_5_EXT = 0x4000 /* MPEG 2.5 (unofficial) extension */ +}; + +enum { + MAD_PRIVATE_HEADER = 0x0100, /* header private bit */ + MAD_PRIVATE_III = 0x001f /* Layer III private bits (up to 5) */ +}; + +void mad_header_init(struct mad_header *); + +# define mad_header_finish(header) /* nothing */ + +int mad_header_decode(struct mad_header *, struct mad_stream *); + +void mad_frame_init(struct mad_frame *); +void mad_frame_finish(struct mad_frame *); + +int mad_frame_decode(struct mad_frame *, struct mad_stream *); + +void mad_frame_mute(struct mad_frame *); + +# endif + +/* Id: synth.h,v 1.2 2005-09-12 07:01:30 dmazzoni Exp */ + +# ifndef LIBMAD_SYNTH_H +# define LIBMAD_SYNTH_H + + +struct mad_pcm { + unsigned int samplerate; /* sampling frequency (Hz) */ + unsigned short channels; /* number of channels */ + unsigned short length; /* number of samples per channel */ + mad_fixed_t samples[2][1152]; /* PCM output samples [ch][sample] */ +}; + +struct mad_synth { + mad_fixed_t filter[2][2][2][16][8]; /* polyphase filterbank outputs */ + /* [ch][eo][peo][s][v] */ + + unsigned int phase; /* current processing phase */ + + struct mad_pcm pcm; /* PCM output */ +}; + +/* single channel PCM selector */ +enum { + MAD_PCM_CHANNEL_SINGLE = 0 +}; + +/* dual channel PCM selector */ +enum { + MAD_PCM_CHANNEL_DUAL_1 = 0, + MAD_PCM_CHANNEL_DUAL_2 = 1 +}; + +/* stereo PCM selector */ +enum { + MAD_PCM_CHANNEL_STEREO_LEFT = 0, + MAD_PCM_CHANNEL_STEREO_RIGHT = 1 +}; + +void mad_synth_init(struct mad_synth *); + +# define mad_synth_finish(synth) /* nothing */ + +void mad_synth_mute(struct mad_synth *); + +void mad_synth_frame(struct mad_synth *, struct mad_frame const *); + +# endif + +/* Id: decoder.h,v 1.2 2005-09-12 07:01:30 dmazzoni Exp */ + +# ifndef LIBMAD_DECODER_H +# define LIBMAD_DECODER_H + + +enum mad_decoder_mode { + MAD_DECODER_MODE_SYNC = 0, + MAD_DECODER_MODE_ASYNC +}; + +enum mad_flow { + MAD_FLOW_CONTINUE = 0x0000, /* continue normally */ + MAD_FLOW_STOP = 0x0010, /* stop decoding normally */ + MAD_FLOW_BREAK = 0x0011, /* stop decoding and signal an error */ + MAD_FLOW_IGNORE = 0x0020 /* ignore the current frame */ +}; + +struct mad_decoder { + enum mad_decoder_mode mode; + + int options; + + struct { + long pid; + int in; + int out; + } async; + + struct { + struct mad_stream stream; + struct mad_frame frame; + struct mad_synth synth; + } *sync; + + void *cb_data; + + enum mad_flow (*input_func)(void *, struct mad_stream *); + enum mad_flow (*header_func)(void *, struct mad_header const *); + enum mad_flow (*filter_func)(void *, + struct mad_stream const *, struct mad_frame *); + enum mad_flow (*output_func)(void *, + struct mad_header const *, struct mad_pcm *); + enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *); + enum mad_flow (*message_func)(void *, void *, unsigned int *); +}; + +void mad_decoder_init(struct mad_decoder *, void *, + enum mad_flow (*)(void *, struct mad_stream *), + enum mad_flow (*)(void *, struct mad_header const *), + enum mad_flow (*)(void *, + struct mad_stream const *, + struct mad_frame *), + enum mad_flow (*)(void *, + struct mad_header const *, + struct mad_pcm *), + enum mad_flow (*)(void *, + struct mad_stream *, + struct mad_frame *), + enum mad_flow (*)(void *, void *, unsigned int *)); +int mad_decoder_finish(struct mad_decoder *); + +# define mad_decoder_options(decoder, opts) \ + ((void) ((decoder)->options = (opts))) + +int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode); +int mad_decoder_message(struct mad_decoder *, void *, unsigned int *); + +# endif + +# ifdef __cplusplus +} +# endif diff --git a/mac/config/i386/lib-src/libogg/config.h b/mac/config/i386/lib-src/libogg/config.h new file mode 100644 index 000000000..0006cd6c4 --- /dev/null +++ b/mac/config/i386/lib-src/libogg/config.h @@ -0,0 +1,102 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ + +/* Name of package */ +#define PACKAGE "libogg" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "ogg-dev@xiph.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "libogg" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "libogg 1.3.1" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libogg" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.3.1" + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `int16_t', as computed by sizeof. */ +#define SIZEOF_INT16_T 2 + +/* The size of `int32_t', as computed by sizeof. */ +#define SIZEOF_INT32_T 4 + +/* The size of `int64_t', as computed by sizeof. */ +#define SIZEOF_INT64_T 8 + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 8 + +/* The size of `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 + +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* The size of `uint16_t', as computed by sizeof. */ +#define SIZEOF_UINT16_T 2 + +/* The size of `uint32_t', as computed by sizeof. */ +#define SIZEOF_UINT32_T 4 + +/* The size of `u_int16_t', as computed by sizeof. */ +#define SIZEOF_U_INT16_T 2 + +/* The size of `u_int32_t', as computed by sizeof. */ +#define SIZEOF_U_INT32_T 4 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "1.3.1" + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ diff --git a/mac/config/i386/lib-src/libogg/include/ogg/config_types.h b/mac/config/i386/lib-src/libogg/include/ogg/config_types.h new file mode 100644 index 000000000..4b00047a0 --- /dev/null +++ b/mac/config/i386/lib-src/libogg/include/ogg/config_types.h @@ -0,0 +1,25 @@ +#ifndef __CONFIG_TYPES_H__ +#define __CONFIG_TYPES_H__ + +/* these are filled in by configure */ +#define INCLUDE_INTTYPES_H 1 +#define INCLUDE_STDINT_H 1 +#define INCLUDE_SYS_TYPES_H 1 + +#if INCLUDE_INTTYPES_H +# include +#endif +#if INCLUDE_STDINT_H +# include +#endif +#if INCLUDE_SYS_TYPES_H +# include +#endif + +typedef int16_t ogg_int16_t; +typedef uint16_t ogg_uint16_t; +typedef int32_t ogg_int32_t; +typedef uint32_t ogg_uint32_t; +typedef int64_t ogg_int64_t; + +#endif diff --git a/mac/config/i386/lib-src/libsndfile/src/config.h b/mac/config/i386/lib-src/libsndfile/src/config.h new file mode 100644 index 000000000..a9813c2cc --- /dev/null +++ b/mac/config/i386/lib-src/libsndfile/src/config.h @@ -0,0 +1,300 @@ +/* src/config.h. Generated from config.h.in by configure. */ +/* src/config.h.in. Generated from configure.ac by autoheader. */ + +/* Set to 1 if the compile is GNU GCC. */ +#define COMPILER_IS_GCC 1 + +/* Target processor clips on negative float to int conversion. */ +#define CPU_CLIPS_NEGATIVE 0 + +/* Target processor clips on positive float to int conversion. */ +#define CPU_CLIPS_POSITIVE 0 + +/* Target processor is big endian. */ +#define CPU_IS_BIG_ENDIAN 0 + +/* Target processor is little endian. */ +#define CPU_IS_LITTLE_ENDIAN 1 + +/* Set to 1 to enable experimental code. */ +#define ENABLE_EXPERIMENTAL_CODE 0 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ALSA_ASOUNDLIB_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BYTESWAP_H */ + +/* Define to 1 if you have the `calloc' function. */ +#define HAVE_CALLOC 1 + +/* Define to 1 if you have the `ceil' function. */ +#define HAVE_CEIL 1 + +/* Set to 1 if S_IRGRP is defined. */ +#define HAVE_DECL_S_IRGRP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ENDIAN_H */ + +/* Will be set to 1 if flac, ogg and vorbis are available. */ +#define HAVE_EXTERNAL_LIBS 0 + +/* Set to 1 if the compile supports the struct hack. */ +#define HAVE_FLEXIBLE_ARRAY 1 + +/* Define to 1 if you have the `floor' function. */ +#define HAVE_FLOOR 1 + +/* Define to 1 if you have the `fmod' function. */ +#define HAVE_FMOD 1 + +/* Define to 1 if you have the `free' function. */ +#define HAVE_FREE 1 + +/* Define to 1 if you have the `fstat' function. */ +#define HAVE_FSTAT 1 + +/* Define to 1 if you have the `fsync' function. */ +#define HAVE_FSYNC 1 + +/* Define to 1 if you have the `ftruncate' function. */ +#define HAVE_FTRUNCATE 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the `gmtime' function. */ +#define HAVE_GMTIME 1 + +/* Define to 1 if you have the `gmtime_r' function. */ +#define HAVE_GMTIME_R 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `m' library (-lm). */ +#define HAVE_LIBM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + +/* Define to 1 if you have the `localtime' function. */ +#define HAVE_LOCALTIME 1 + +/* Define to 1 if you have the `localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + +/* Define if you have C99's lrint function. */ +#define HAVE_LRINT 1 + +/* Define if you have C99's lrintf function. */ +#define HAVE_LRINTF 1 + +/* Define to 1 if you have the `lseek' function. */ +#define HAVE_LSEEK 1 + +/* Define to 1 if you have the `malloc' function. */ +#define HAVE_MALLOC 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mmap' function. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the `open' function. */ +#define HAVE_OPEN 1 + +/* Define to 1 if you have the `pipe' function. */ +#define HAVE_PIPE 1 + +/* Define to 1 if you have the `pread' function. */ +#define HAVE_PREAD 1 + +/* Define to 1 if you have the `pwrite' function. */ +#define HAVE_PWRITE 1 + +/* Define to 1 if you have the `read' function. */ +#define HAVE_READ 1 + +/* Define to 1 if you have the `realloc' function. */ +#define HAVE_REALLOC 1 + +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SNDIO_H */ + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Set to 1 if you have libsqlite3. */ +#define HAVE_SQLITE3 0 + +/* Define to 1 if the system has the type `ssize_t'. */ +#define HAVE_SSIZE_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the `waitpid' function. */ +#define HAVE_WAITPID 1 + +/* Define to 1 if you have the `write' function. */ +#define HAVE_WRITE 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ + +/* Set to 1 if compiling for MacOSX */ +#define OS_IS_MACOSX 1 + +/* Set to 1 if compiling for Win32 */ +#define OS_IS_WIN32 0 + +/* Name of package */ +#define PACKAGE "libsndfile" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "sndfile@mega-nerd.com" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "libsndfile" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "libsndfile 1.0.24" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libsndfile" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "http://www.mega-nerd.com/libsndfile/" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.0.24" + +/* Set to maximum allowed value of sf_count_t type. */ +#define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL + +/* The size of `double', as computed by sizeof. */ +#define SIZEOF_DOUBLE 8 + +/* The size of `float', as computed by sizeof. */ +#define SIZEOF_FLOAT 4 + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `int64_t', as computed by sizeof. */ +#define SIZEOF_INT64_T 8 + +/* The size of `loff_t', as computed by sizeof. */ +/* #undef SIZEOF_LOFF_T */ + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 8 + +/* The size of `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 + +/* The size of `off64_t', as computed by sizeof. */ +/* #undef SIZEOF_OFF64_T */ + +/* The size of `off_t', as computed by sizeof. */ +#define SIZEOF_OFF_T 8 + +/* Set to sizeof (long) if unknown. */ +#define SIZEOF_SF_COUNT_T 8 + +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* The size of `size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 8 + +/* The size of `ssize_t', as computed by sizeof. */ +#define SIZEOF_SSIZE_T 8 + +/* The size of `void*', as computed by sizeof. */ +#define SIZEOF_VOIDP 8 + +/* The size of `wchar_t', as computed by sizeof. */ +#define SIZEOF_WCHAR_T 4 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Set to long if unknown. */ +#define TYPEOF_SF_COUNT_T int64_t + +/* Set to 1 to use the native windows API */ +#define USE_WINDOWS_API 0 + +/* Version number of package */ +#define VERSION "1.0.24" + +/* Set to 1 if windows DLL is being built. */ +#define WIN32_TARGET_DLL 0 + +/* Target processor is big endian. */ +#define WORDS_BIGENDIAN 0 + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define to make fseeko etc. visible, on some hosts. */ +/* #undef _LARGEFILE_SOURCE */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +/* Set to 1 to use C99 printf/snprintf in MinGW. */ +/* #undef __USE_MINGW_ANSI_STDIO */ +#undef CPU_IS_BIG_ENDIAN +#undef CPU_IS_LITTLE_ENDIAN +#if defined(__BIG_ENDIAN__) +#define CPU_IS_BIG_ENDIAN 1 +#define CPU_IS_LITTLE_ENDIAN 0 +#else +#define CPU_IS_BIG_ENDIAN 0 +#define CPU_IS_LITTLE_ENDIAN 1 +#endif diff --git a/mac/config/i386/lib-src/libsndfile/src/sndfile.h b/mac/config/i386/lib-src/libsndfile/src/sndfile.h new file mode 100644 index 000000000..eaeca304b --- /dev/null +++ b/mac/config/i386/lib-src/libsndfile/src/sndfile.h @@ -0,0 +1,666 @@ +/* +** Copyright (C) 1999-2011Erik de Castro Lopo +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation; either version 2.1 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +/* +** sndfile.h -- system-wide definitions +** +** API documentation is in the doc/ directory of the source code tarball +** and at http://www.mega-nerd.com/libsndfile/api.html. +*/ + +#ifndef SNDFILE_H +#define SNDFILE_H + +/* This is the version 1.0.X header file. */ +#define SNDFILE_1 + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* The following file types can be read and written. +** A file type would consist of a major type (ie SF_FORMAT_WAV) bitwise +** ORed with a minor type (ie SF_FORMAT_PCM). SF_FORMAT_TYPEMASK and +** SF_FORMAT_SUBMASK can be used to separate the major and minor file +** types. +*/ + +enum +{ /* Major formats. */ + SF_FORMAT_WAV = 0x010000, /* Microsoft WAV format (little endian default). */ + SF_FORMAT_AIFF = 0x020000, /* Apple/SGI AIFF format (big endian). */ + SF_FORMAT_AU = 0x030000, /* Sun/NeXT AU format (big endian). */ + SF_FORMAT_RAW = 0x040000, /* RAW PCM data. */ + SF_FORMAT_PAF = 0x050000, /* Ensoniq PARIS file format. */ + SF_FORMAT_SVX = 0x060000, /* Amiga IFF / SVX8 / SV16 format. */ + SF_FORMAT_NIST = 0x070000, /* Sphere NIST format. */ + SF_FORMAT_VOC = 0x080000, /* VOC files. */ + SF_FORMAT_IRCAM = 0x0A0000, /* Berkeley/IRCAM/CARL */ + SF_FORMAT_W64 = 0x0B0000, /* Sonic Foundry's 64 bit RIFF/WAV */ + SF_FORMAT_MAT4 = 0x0C0000, /* Matlab (tm) V4.2 / GNU Octave 2.0 */ + SF_FORMAT_MAT5 = 0x0D0000, /* Matlab (tm) V5.0 / GNU Octave 2.1 */ + SF_FORMAT_PVF = 0x0E0000, /* Portable Voice Format */ + SF_FORMAT_XI = 0x0F0000, /* Fasttracker 2 Extended Instrument */ + SF_FORMAT_HTK = 0x100000, /* HMM Tool Kit format */ + SF_FORMAT_SDS = 0x110000, /* Midi Sample Dump Standard */ + SF_FORMAT_AVR = 0x120000, /* Audio Visual Research */ + SF_FORMAT_WAVEX = 0x130000, /* MS WAVE with WAVEFORMATEX */ + SF_FORMAT_SD2 = 0x160000, /* Sound Designer 2 */ + SF_FORMAT_FLAC = 0x170000, /* FLAC lossless file format */ + SF_FORMAT_CAF = 0x180000, /* Core Audio File format */ + SF_FORMAT_WVE = 0x190000, /* Psion WVE format */ + SF_FORMAT_OGG = 0x200000, /* Xiph OGG container */ + SF_FORMAT_MPC2K = 0x210000, /* Akai MPC 2000 sampler */ + SF_FORMAT_RF64 = 0x220000, /* RF64 WAV file */ + + /* Subtypes from here on. */ + + SF_FORMAT_PCM_S8 = 0x0001, /* Signed 8 bit data */ + SF_FORMAT_PCM_16 = 0x0002, /* Signed 16 bit data */ + SF_FORMAT_PCM_24 = 0x0003, /* Signed 24 bit data */ + SF_FORMAT_PCM_32 = 0x0004, /* Signed 32 bit data */ + + SF_FORMAT_PCM_U8 = 0x0005, /* Unsigned 8 bit data (WAV and RAW only) */ + + SF_FORMAT_FLOAT = 0x0006, /* 32 bit float data */ + SF_FORMAT_DOUBLE = 0x0007, /* 64 bit float data */ + + SF_FORMAT_ULAW = 0x0010, /* U-Law encoded. */ + SF_FORMAT_ALAW = 0x0011, /* A-Law encoded. */ + SF_FORMAT_IMA_ADPCM = 0x0012, /* IMA ADPCM. */ + SF_FORMAT_MS_ADPCM = 0x0013, /* Microsoft ADPCM. */ + + SF_FORMAT_GSM610 = 0x0020, /* GSM 6.10 encoding. */ + SF_FORMAT_VOX_ADPCM = 0x0021, /* OKI / Dialogix ADPCM */ + + SF_FORMAT_G721_32 = 0x0030, /* 32kbs G721 ADPCM encoding. */ + SF_FORMAT_G723_24 = 0x0031, /* 24kbs G723 ADPCM encoding. */ + SF_FORMAT_G723_40 = 0x0032, /* 40kbs G723 ADPCM encoding. */ + + SF_FORMAT_DWVW_12 = 0x0040, /* 12 bit Delta Width Variable Word encoding. */ + SF_FORMAT_DWVW_16 = 0x0041, /* 16 bit Delta Width Variable Word encoding. */ + SF_FORMAT_DWVW_24 = 0x0042, /* 24 bit Delta Width Variable Word encoding. */ + SF_FORMAT_DWVW_N = 0x0043, /* N bit Delta Width Variable Word encoding. */ + + SF_FORMAT_DPCM_8 = 0x0050, /* 8 bit differential PCM (XI only) */ + SF_FORMAT_DPCM_16 = 0x0051, /* 16 bit differential PCM (XI only) */ + + SF_FORMAT_VORBIS = 0x0060, /* Xiph Vorbis encoding. */ + + /* Endian-ness options. */ + + SF_ENDIAN_FILE = 0x00000000, /* Default file endian-ness. */ + SF_ENDIAN_LITTLE = 0x10000000, /* Force little endian-ness. */ + SF_ENDIAN_BIG = 0x20000000, /* Force big endian-ness. */ + SF_ENDIAN_CPU = 0x30000000, /* Force CPU endian-ness. */ + + SF_FORMAT_SUBMASK = 0x0000FFFF, + SF_FORMAT_TYPEMASK = 0x0FFF0000, + SF_FORMAT_ENDMASK = 0x30000000 +} ; + +/* +** The following are the valid command numbers for the sf_command() +** interface. The use of these commands is documented in the file +** command.html in the doc directory of the source code distribution. +*/ + +enum +{ SFC_GET_LIB_VERSION = 0x1000, + SFC_GET_LOG_INFO = 0x1001, + SFC_GET_CURRENT_SF_INFO = 0x1002, + + + SFC_GET_NORM_DOUBLE = 0x1010, + SFC_GET_NORM_FLOAT = 0x1011, + SFC_SET_NORM_DOUBLE = 0x1012, + SFC_SET_NORM_FLOAT = 0x1013, + SFC_SET_SCALE_FLOAT_INT_READ = 0x1014, + SFC_SET_SCALE_INT_FLOAT_WRITE = 0x1015, + + SFC_GET_SIMPLE_FORMAT_COUNT = 0x1020, + SFC_GET_SIMPLE_FORMAT = 0x1021, + + SFC_GET_FORMAT_INFO = 0x1028, + + SFC_GET_FORMAT_MAJOR_COUNT = 0x1030, + SFC_GET_FORMAT_MAJOR = 0x1031, + SFC_GET_FORMAT_SUBTYPE_COUNT = 0x1032, + SFC_GET_FORMAT_SUBTYPE = 0x1033, + + SFC_CALC_SIGNAL_MAX = 0x1040, + SFC_CALC_NORM_SIGNAL_MAX = 0x1041, + SFC_CALC_MAX_ALL_CHANNELS = 0x1042, + SFC_CALC_NORM_MAX_ALL_CHANNELS = 0x1043, + SFC_GET_SIGNAL_MAX = 0x1044, + SFC_GET_MAX_ALL_CHANNELS = 0x1045, + + SFC_SET_ADD_PEAK_CHUNK = 0x1050, + SFC_SET_ADD_HEADER_PAD_CHUNK = 0x1051, + + SFC_UPDATE_HEADER_NOW = 0x1060, + SFC_SET_UPDATE_HEADER_AUTO = 0x1061, + + SFC_FILE_TRUNCATE = 0x1080, + + SFC_SET_RAW_START_OFFSET = 0x1090, + + SFC_SET_DITHER_ON_WRITE = 0x10A0, + SFC_SET_DITHER_ON_READ = 0x10A1, + + SFC_GET_DITHER_INFO_COUNT = 0x10A2, + SFC_GET_DITHER_INFO = 0x10A3, + + SFC_GET_EMBED_FILE_INFO = 0x10B0, + + SFC_SET_CLIPPING = 0x10C0, + SFC_GET_CLIPPING = 0x10C1, + + SFC_GET_INSTRUMENT = 0x10D0, + SFC_SET_INSTRUMENT = 0x10D1, + + SFC_GET_LOOP_INFO = 0x10E0, + + SFC_GET_BROADCAST_INFO = 0x10F0, + SFC_SET_BROADCAST_INFO = 0x10F1, + + SFC_GET_CHANNEL_MAP_INFO = 0x1100, + SFC_SET_CHANNEL_MAP_INFO = 0x1101, + + SFC_RAW_DATA_NEEDS_ENDSWAP = 0x1110, + + /* Support for Wavex Ambisonics Format */ + SFC_WAVEX_SET_AMBISONIC = 0x1200, + SFC_WAVEX_GET_AMBISONIC = 0x1201, + + SFC_SET_VBR_ENCODING_QUALITY = 0x1300, + + /* Following commands for testing only. */ + SFC_TEST_IEEE_FLOAT_REPLACE = 0x6001, + + /* + ** SFC_SET_ADD_* values are deprecated and will disappear at some + ** time in the future. They are guaranteed to be here up to and + ** including version 1.0.8 to avoid breakage of existng software. + ** They currently do nothing and will continue to do nothing. + */ + SFC_SET_ADD_DITHER_ON_WRITE = 0x1070, + SFC_SET_ADD_DITHER_ON_READ = 0x1071 +} ; + + +/* +** String types that can be set and read from files. Not all file types +** support this and even the file types which support one, may not support +** all string types. +*/ + +enum +{ SF_STR_TITLE = 0x01, + SF_STR_COPYRIGHT = 0x02, + SF_STR_SOFTWARE = 0x03, + SF_STR_ARTIST = 0x04, + SF_STR_COMMENT = 0x05, + SF_STR_DATE = 0x06, + SF_STR_ALBUM = 0x07, + SF_STR_LICENSE = 0x08, + SF_STR_TRACKNUMBER = 0x09, + SF_STR_GENRE = 0x10 +} ; + +/* +** Use the following as the start and end index when doing metadata +** transcoding. +*/ + +#define SF_STR_FIRST SF_STR_TITLE +#define SF_STR_LAST SF_STR_LICENSE + +enum +{ /* True and false */ + SF_FALSE = 0, + SF_TRUE = 1, + + /* Modes for opening files. */ + SFM_READ = 0x10, + SFM_WRITE = 0x20, + SFM_RDWR = 0x30, + + SF_AMBISONIC_NONE = 0x40, + SF_AMBISONIC_B_FORMAT = 0x41 +} ; + +/* Public error values. These are guaranteed to remain unchanged for the duration +** of the library major version number. +** There are also a large number of private error numbers which are internal to +** the library which can change at any time. +*/ + +enum +{ SF_ERR_NO_ERROR = 0, + SF_ERR_UNRECOGNISED_FORMAT = 1, + SF_ERR_SYSTEM = 2, + SF_ERR_MALFORMED_FILE = 3, + SF_ERR_UNSUPPORTED_ENCODING = 4 +} ; + + +/* Channel map values (used with SFC_SET/GET_CHANNEL_MAP). +*/ + +enum +{ SF_CHANNEL_MAP_INVALID = 0, + SF_CHANNEL_MAP_MONO = 1, + SF_CHANNEL_MAP_LEFT, /* Apple calls this 'Left' */ + SF_CHANNEL_MAP_RIGHT, /* Apple calls this 'Right' */ + SF_CHANNEL_MAP_CENTER, /* Apple calls this 'Center' */ + SF_CHANNEL_MAP_FRONT_LEFT, + SF_CHANNEL_MAP_FRONT_RIGHT, + SF_CHANNEL_MAP_FRONT_CENTER, + SF_CHANNEL_MAP_REAR_CENTER, /* Apple calls this 'Center Surround', Msft calls this 'Back Center' */ + SF_CHANNEL_MAP_REAR_LEFT, /* Apple calls this 'Left Surround', Msft calls this 'Back Left' */ + SF_CHANNEL_MAP_REAR_RIGHT, /* Apple calls this 'Right Surround', Msft calls this 'Back Right' */ + SF_CHANNEL_MAP_LFE, /* Apple calls this 'LFEScreen', Msft calls this 'Low Frequency' */ + SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER, /* Apple calls this 'Left Center' */ + SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER, /* Apple calls this 'Right Center */ + SF_CHANNEL_MAP_SIDE_LEFT, /* Apple calls this 'Left Surround Direct' */ + SF_CHANNEL_MAP_SIDE_RIGHT, /* Apple calls this 'Right Surround Direct' */ + SF_CHANNEL_MAP_TOP_CENTER, /* Apple calls this 'Top Center Surround' */ + SF_CHANNEL_MAP_TOP_FRONT_LEFT, /* Apple calls this 'Vertical Height Left' */ + SF_CHANNEL_MAP_TOP_FRONT_RIGHT, /* Apple calls this 'Vertical Height Right' */ + SF_CHANNEL_MAP_TOP_FRONT_CENTER, /* Apple calls this 'Vertical Height Center' */ + SF_CHANNEL_MAP_TOP_REAR_LEFT, /* Apple and MS call this 'Top Back Left' */ + SF_CHANNEL_MAP_TOP_REAR_RIGHT, /* Apple and MS call this 'Top Back Right' */ + SF_CHANNEL_MAP_TOP_REAR_CENTER, /* Apple and MS call this 'Top Back Center' */ + + SF_CHANNEL_MAP_AMBISONIC_B_W, + SF_CHANNEL_MAP_AMBISONIC_B_X, + SF_CHANNEL_MAP_AMBISONIC_B_Y, + SF_CHANNEL_MAP_AMBISONIC_B_Z, + + SF_CHANNEL_MAP_MAX +} ; + + +/* A SNDFILE* pointer can be passed around much like stdio.h's FILE* pointer. */ + +typedef struct SNDFILE_tag SNDFILE ; + +/* The following typedef is system specific and is defined when libsndfile is +** compiled. sf_count_t will be a 64 bit value when the underlying OS allows +** 64 bit file offsets. +** On windows, we need to allow the same header file to be compiler by both GCC +** and the Microsoft compiler. +*/ + +#if (defined (_MSCVER) || defined (_MSC_VER)) +typedef __int64 sf_count_t ; +#define SF_COUNT_MAX 0x7fffffffffffffffi64 +#else +typedef int64_t sf_count_t ; +#define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL +#endif + + +/* A pointer to a SF_INFO structure is passed to sf_open () and filled in. +** On write, the SF_INFO structure is filled in by the user and passed into +** sf_open (). +*/ + +struct SF_INFO +{ sf_count_t frames ; /* Used to be called samples. Changed to avoid confusion. */ + int samplerate ; + int channels ; + int format ; + int sections ; + int seekable ; +} ; + +typedef struct SF_INFO SF_INFO ; + +/* The SF_FORMAT_INFO struct is used to retrieve information about the sound +** file formats libsndfile supports using the sf_command () interface. +** +** Using this interface will allow applications to support new file formats +** and encoding types when libsndfile is upgraded, without requiring +** re-compilation of the application. +** +** Please consult the libsndfile documentation (particularly the information +** on the sf_command () interface) for examples of its use. +*/ + +typedef struct +{ int format ; + const char *name ; + const char *extension ; +} SF_FORMAT_INFO ; + +/* +** Enums and typedefs for adding dither on read and write. +** See the html documentation for sf_command(), SFC_SET_DITHER_ON_WRITE +** and SFC_SET_DITHER_ON_READ. +*/ + +enum +{ SFD_DEFAULT_LEVEL = 0, + SFD_CUSTOM_LEVEL = 0x40000000, + + SFD_NO_DITHER = 500, + SFD_WHITE = 501, + SFD_TRIANGULAR_PDF = 502 +} ; + +typedef struct +{ int type ; + double level ; + const char *name ; +} SF_DITHER_INFO ; + +/* Struct used to retrieve information about a file embedded within a +** larger file. See SFC_GET_EMBED_FILE_INFO. +*/ + +typedef struct +{ sf_count_t offset ; + sf_count_t length ; +} SF_EMBED_FILE_INFO ; + +/* +** Structs used to retrieve music sample information from a file. +*/ + +enum +{ /* + ** The loop mode field in SF_INSTRUMENT will be one of the following. + */ + SF_LOOP_NONE = 800, + SF_LOOP_FORWARD, + SF_LOOP_BACKWARD, + SF_LOOP_ALTERNATING +} ; + +typedef struct +{ int gain ; + char basenote, detune ; + char velocity_lo, velocity_hi ; + char key_lo, key_hi ; + int loop_count ; + + struct + { int mode ; + unsigned int start ; + unsigned int end ; + unsigned int count ; + } loops [16] ; /* make variable in a sensible way */ +} SF_INSTRUMENT ; + + + +/* Struct used to retrieve loop information from a file.*/ +typedef struct +{ + short time_sig_num ; /* any positive integer > 0 */ + short time_sig_den ; /* any positive power of 2 > 0 */ + int loop_mode ; /* see SF_LOOP enum */ + + int num_beats ; /* this is NOT the amount of quarter notes !!!*/ + /* a full bar of 4/4 is 4 beats */ + /* a full bar of 7/8 is 7 beats */ + + float bpm ; /* suggestion, as it can be calculated using other fields:*/ + /* file's lenght, file's sampleRate and our time_sig_den*/ + /* -> bpms are always the amount of _quarter notes_ per minute */ + + int root_key ; /* MIDI note, or -1 for None */ + int future [6] ; +} SF_LOOP_INFO ; + + +/* Struct used to retrieve broadcast (EBU) information from a file. +** Strongly (!) based on EBU "bext" chunk format used in Broadcast WAVE. +*/ +#define SF_BROADCAST_INFO_VAR(coding_hist_size) \ + struct \ + { char description [256] ; \ + char originator [32] ; \ + char originator_reference [32] ; \ + char origination_date [10] ; \ + char origination_time [8] ; \ + unsigned int time_reference_low ; \ + unsigned int time_reference_high ; \ + short version ; \ + char umid [64] ; \ + char reserved [190] ; \ + unsigned int coding_history_size ; \ + char coding_history [coding_hist_size] ; \ + } + +/* SF_BROADCAST_INFO is the above struct with coding_history field of 256 bytes. */ +typedef SF_BROADCAST_INFO_VAR (256) SF_BROADCAST_INFO ; + + +/* Virtual I/O functionality. */ + +typedef sf_count_t (*sf_vio_get_filelen) (void *user_data) ; +typedef sf_count_t (*sf_vio_seek) (sf_count_t offset, int whence, void *user_data) ; +typedef sf_count_t (*sf_vio_read) (void *ptr, sf_count_t count, void *user_data) ; +typedef sf_count_t (*sf_vio_write) (const void *ptr, sf_count_t count, void *user_data) ; +typedef sf_count_t (*sf_vio_tell) (void *user_data) ; + +struct SF_VIRTUAL_IO +{ sf_vio_get_filelen get_filelen ; + sf_vio_seek seek ; + sf_vio_read read ; + sf_vio_write write ; + sf_vio_tell tell ; +} ; + +typedef struct SF_VIRTUAL_IO SF_VIRTUAL_IO ; + + +/* Open the specified file for read, write or both. On error, this will +** return a NULL pointer. To find the error number, pass a NULL SNDFILE +** to sf_strerror (). +** All calls to sf_open() should be matched with a call to sf_close(). +*/ + +SNDFILE* sf_open (const char *path, int mode, SF_INFO *sfinfo) ; + + +/* Use the existing file descriptor to create a SNDFILE object. If close_desc +** is TRUE, the file descriptor will be closed when sf_close() is called. If +** it is FALSE, the descritor will not be closed. +** When passed a descriptor like this, the library will assume that the start +** of file header is at the current file offset. This allows sound files within +** larger container files to be read and/or written. +** On error, this will return a NULL pointer. To find the error number, pass a +** NULL SNDFILE to sf_strerror (). +** All calls to sf_open_fd() should be matched with a call to sf_close(). + +*/ + +SNDFILE* sf_open_fd (int fd, int mode, SF_INFO *sfinfo, int close_desc) ; + +SNDFILE* sf_open_virtual (SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user_data) ; + + +/* sf_error () returns a error number which can be translated to a text +** string using sf_error_number(). +*/ + +int sf_error (SNDFILE *sndfile) ; + + +/* sf_strerror () returns to the caller a pointer to the current error message for +** the given SNDFILE. +*/ + +const char* sf_strerror (SNDFILE *sndfile) ; + + +/* sf_error_number () allows the retrieval of the error string for each internal +** error number. +** +*/ + +const char* sf_error_number (int errnum) ; + + +/* The following two error functions are deprecated but they will remain in the +** library for the forseeable future. The function sf_strerror() should be used +** in their place. +*/ + +int sf_perror (SNDFILE *sndfile) ; +int sf_error_str (SNDFILE *sndfile, char* str, size_t len) ; + + +/* Return TRUE if fields of the SF_INFO struct are a valid combination of values. */ + +int sf_command (SNDFILE *sndfile, int command, void *data, int datasize) ; + + +/* Return TRUE if fields of the SF_INFO struct are a valid combination of values. */ + +int sf_format_check (const SF_INFO *info) ; + + +/* Seek within the waveform data chunk of the SNDFILE. sf_seek () uses +** the same values for whence (SEEK_SET, SEEK_CUR and SEEK_END) as +** stdio.h function fseek (). +** An offset of zero with whence set to SEEK_SET will position the +** read / write pointer to the first data sample. +** On success sf_seek returns the current position in (multi-channel) +** samples from the start of the file. +** Please see the libsndfile documentation for moving the read pointer +** separately from the write pointer on files open in mode SFM_RDWR. +** On error all of these functions return -1. +*/ + +sf_count_t sf_seek (SNDFILE *sndfile, sf_count_t frames, int whence) ; + + +/* Functions for retrieving and setting string data within sound files. +** Not all file types support this features; AIFF and WAV do. For both +** functions, the str_type parameter must be one of the SF_STR_* values +** defined above. +** On error, sf_set_string() returns non-zero while sf_get_string() +** returns NULL. +*/ + +int sf_set_string (SNDFILE *sndfile, int str_type, const char* str) ; + +const char* sf_get_string (SNDFILE *sndfile, int str_type) ; + + +/* Return the library version string. */ + +const char * sf_version_string (void) ; + + +/* Functions for reading/writing the waveform data of a sound file. +*/ + +sf_count_t sf_read_raw (SNDFILE *sndfile, void *ptr, sf_count_t bytes) ; +sf_count_t sf_write_raw (SNDFILE *sndfile, const void *ptr, sf_count_t bytes) ; + + +/* Functions for reading and writing the data chunk in terms of frames. +** The number of items actually read/written = frames * number of channels. +** sf_xxxx_raw read/writes the raw data bytes from/to the file +** sf_xxxx_short passes data in the native short format +** sf_xxxx_int passes data in the native int format +** sf_xxxx_float passes data in the native float format +** sf_xxxx_double passes data in the native double format +** All of these read/write function return number of frames read/written. +*/ + +sf_count_t sf_readf_short (SNDFILE *sndfile, short *ptr, sf_count_t frames) ; +sf_count_t sf_writef_short (SNDFILE *sndfile, const short *ptr, sf_count_t frames) ; + +sf_count_t sf_readf_int (SNDFILE *sndfile, int *ptr, sf_count_t frames) ; +sf_count_t sf_writef_int (SNDFILE *sndfile, const int *ptr, sf_count_t frames) ; + +sf_count_t sf_readf_float (SNDFILE *sndfile, float *ptr, sf_count_t frames) ; +sf_count_t sf_writef_float (SNDFILE *sndfile, const float *ptr, sf_count_t frames) ; + +sf_count_t sf_readf_double (SNDFILE *sndfile, double *ptr, sf_count_t frames) ; +sf_count_t sf_writef_double (SNDFILE *sndfile, const double *ptr, sf_count_t frames) ; + + +/* Functions for reading and writing the data chunk in terms of items. +** Otherwise similar to above. +** All of these read/write function return number of items read/written. +*/ + +sf_count_t sf_read_short (SNDFILE *sndfile, short *ptr, sf_count_t items) ; +sf_count_t sf_write_short (SNDFILE *sndfile, const short *ptr, sf_count_t items) ; + +sf_count_t sf_read_int (SNDFILE *sndfile, int *ptr, sf_count_t items) ; +sf_count_t sf_write_int (SNDFILE *sndfile, const int *ptr, sf_count_t items) ; + +sf_count_t sf_read_float (SNDFILE *sndfile, float *ptr, sf_count_t items) ; +sf_count_t sf_write_float (SNDFILE *sndfile, const float *ptr, sf_count_t items) ; + +sf_count_t sf_read_double (SNDFILE *sndfile, double *ptr, sf_count_t items) ; +sf_count_t sf_write_double (SNDFILE *sndfile, const double *ptr, sf_count_t items) ; + + +/* Close the SNDFILE and clean up all memory allocations associated with this +** file. +** Returns 0 on success, or an error number. +*/ + +int sf_close (SNDFILE *sndfile) ; + + +/* If the file is opened SFM_WRITE or SFM_RDWR, call fsync() on the file +** to force the writing of data to disk. If the file is opened SFM_READ +** no action is taken. +*/ + +void sf_write_sync (SNDFILE *sndfile) ; + + + +/* The function sf_wchar_open() is Windows Only! +** Open a file passing in a Windows Unicode filename. Otherwise, this is +** the same as sf_open(). +** +** In order for this to work, you need to do the following: +** +** #include +** #define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1 +** #including +*/ + +#if ENABLE_SNDFILE_WINDOWS_PROTOTYPES +SNDFILE* sf_wchar_open (LPCWSTR wpath, int mode, SF_INFO *sfinfo) ; +#endif + + + +#ifdef __cplusplus +} /* extern "C" */ +#endif /* __cplusplus */ + +#endif /* SNDFILE_H */ + diff --git a/mac/config/i386/lib-src/libsoxr/soxr-config.h b/mac/config/i386/lib-src/libsoxr/soxr-config.h new file mode 100644 index 000000000..540e71f01 --- /dev/null +++ b/mac/config/i386/lib-src/libsoxr/soxr-config.h @@ -0,0 +1,52 @@ +/* SoX Resampler Library Copyright (c) 2007-13 robs@users.sourceforge.net + * Licence for this file: LGPL v2.1 See LICENCE for details. */ + +#if !defined soxr_config_included +#define soxr_config_included + +#define HAVE_SINGLE_PRECISION 1 +#define HAVE_DOUBLE_PRECISION 1 +#define HAVE_AVFFT 0 +#define HAVE_SIMD 1 +#define HAVE_FENV_H 1 +#define HAVE_LRINT 1 +#define WORDS_BIGENDIAN 0 + +#include + +#undef bool +#undef false +#undef true +#define bool int +#define false 0 +#define true 1 + +#undef int16_t +#undef int32_t +#undef int64_t +#undef uint32_t +#undef uint64_t +#define int16_t short +#if LONG_MAX > 2147483647L + #define int32_t int + #define int64_t long +#elif LONG_MAX < 2147483647L +#error this library requires that 'long int' has at least 32-bits +#else + #define int32_t long + #if defined _MSC_VER + #define int64_t __int64 + #else + #define int64_t long long + #endif +#endif +#define uint32_t unsigned int32_t +#define uint64_t unsigned int64_t + +#endif +#if defined(__BIG_ENDIAN__) +#undef WORDS_BIGENDIAN +#define WORDS_BIGENDIAN 1 +#endif +#undef HAVE_SIMD +#define HAVE_SIMD 0 diff --git a/mac/config/i386/lib-src/libvorbis/config.h b/mac/config/i386/lib-src/libvorbis/config.h new file mode 100644 index 000000000..13ee952ba --- /dev/null +++ b/mac/config/i386/lib-src/libvorbis/config.h @@ -0,0 +1,98 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ + +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ + +/* Define to 1 if you have `alloca', as a function or macro. */ +#define HAVE_ALLOCA 1 + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +#define HAVE_ALLOCA_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ + +/* Name of package */ +#define PACKAGE "libvorbis" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "vorbis-dev@xiph.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "libvorbis" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "libvorbis 1.3.3" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libvorbis" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.3.3" + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at runtime. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "1.3.3" + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ diff --git a/mac/config/i386/lib-src/lv2/lilv/lilv_config.h b/mac/config/i386/lib-src/lv2/lilv/lilv_config.h new file mode 100644 index 000000000..4c159c577 --- /dev/null +++ b/mac/config/i386/lib-src/lv2/lilv/lilv_config.h @@ -0,0 +1,19 @@ +/* WARNING! All changes made to this file will be lost! */ + +#ifndef W_LILV_CONFIG_H_WAF +#define W_LILV_CONFIG_H_WAF + +#define HAVE_LV2 1 +#define HAVE_SERD 1 +#define HAVE_SORD 1 +#define HAVE_SRATOM 1 +#define LILV_NEW_LV2 1 +/* #undef HAVE_FLOCK */ +/* #undef HAVE_FILENO */ +/* #undef HAVE_CLOCK_GETTIME */ +#define LILV_VERSION "0.20.0" +#define LILV_PATH_SEP ":" +#define LILV_DIR_SEP "/" +#define LILV_DEFAULT_LV2_PATH "~/Library/Audio/Plug-Ins/LV2:~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:/Library/Audio/Plug-Ins/LV2" + +#endif /* W_LILV_CONFIG_H_WAF */ diff --git a/mac/config/i386/lib-src/lv2/serd/serd_config.h b/mac/config/i386/lib-src/lv2/serd/serd_config.h new file mode 100644 index 000000000..38200b064 --- /dev/null +++ b/mac/config/i386/lib-src/lv2/serd/serd_config.h @@ -0,0 +1,12 @@ +/* WARNING! All changes made to this file will be lost! */ + +#ifndef W_SERD_CONFIG_H_WAF +#define W_SERD_CONFIG_H_WAF + +#define HAVE_FMAX 1 +#define HAVE_POSIX_MEMALIGN 1 +/* #undef HAVE_POSIX_FADVISE */ +#define HAVE_FILENO 1 +#define SERD_VERSION "0.20.0" + +#endif /* W_SERD_CONFIG_H_WAF */ diff --git a/mac/config/i386/lib-src/lv2/sord/sord_config.h b/mac/config/i386/lib-src/lv2/sord/sord_config.h new file mode 100644 index 000000000..7f33112dd --- /dev/null +++ b/mac/config/i386/lib-src/lv2/sord/sord_config.h @@ -0,0 +1,10 @@ +/* WARNING! All changes made to this file will be lost! */ + +#ifndef W_SORD_CONFIG_H_WAF +#define W_SORD_CONFIG_H_WAF + +#define HAVE_SERD 1 +#define HAVE_PCRE 1 +#define SORD_VERSION "0.12.2" + +#endif /* W_SORD_CONFIG_H_WAF */ diff --git a/mac/config/i386/lib-src/lv2/sratom/sratom_config.h b/mac/config/i386/lib-src/lv2/sratom/sratom_config.h new file mode 100644 index 000000000..19a941f7d --- /dev/null +++ b/mac/config/i386/lib-src/lv2/sratom/sratom_config.h @@ -0,0 +1,11 @@ +/* WARNING! All changes made to this file will be lost! */ + +#ifndef W_SRATOM_CONFIG_H_WAF +#define W_SRATOM_CONFIG_H_WAF + +#define HAVE_LV2 1 +#define HAVE_SERD 1 +#define HAVE_SORD 1 +#define SRATOM_VERSION "0.4.6" + +#endif /* W_SRATOM_CONFIG_H_WAF */ diff --git a/mac/config/i386/lib-src/lv2/sratom/suil_config.h b/mac/config/i386/lib-src/lv2/sratom/suil_config.h new file mode 100644 index 000000000..d54e0f970 --- /dev/null +++ b/mac/config/i386/lib-src/lv2/sratom/suil_config.h @@ -0,0 +1,16 @@ +/* WARNING! All changes made to this file will be lost! */ + +#ifndef W_SUIL_CONFIG_H_WAF +#define W_SUIL_CONFIG_H_WAF + +#define HAVE_LV2 1 +#define HAVE_LV2_1_6_0 1 +/* #undef HAVE_LIBDL */ +#define SUIL_VERSION "0.8.2" +#define SUIL_MODULE_DIR "/Users/yam/o/audacity/lib-src/lv2/suil/build" +#define SUIL_DIR_SEP "/" +#define SUIL_GTK2_LIB_NAME "libgtk-x11-2.0.so.0" +#define SUIL_MODULE_PREFIX "lib" +#define SUIL_MODULE_EXT ".so" + +#endif /* W_SUIL_CONFIG_H_WAF */ diff --git a/mac/config/i386/lib-src/sbsms/src/config.h b/mac/config/i386/lib-src/sbsms/src/config.h new file mode 100644 index 000000000..222ab29fe --- /dev/null +++ b/mac/config/i386/lib-src/sbsms/src/config.h @@ -0,0 +1,75 @@ +/* src/config.h. Generated from config.h.in by configure. */ +/* src/config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to enable sse */ +#define ENABLE_SSE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define if you have C99's lrint function. */ +#define HAVE_LRINT 1 + +/* Define if you have C99's lrintf function. */ +#define HAVE_LRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Define to compile multithreaded sbsms */ +/* #undef MULTITHREADED */ + +/* Name of package */ +#define PACKAGE "sbsms" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "sbsms" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "sbsms 2.0.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "sbsms" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "2.0.0" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "2.0.0" diff --git a/mac/config/i386/lib-src/soundtouch/include/soundtouch_config.h b/mac/config/i386/lib-src/soundtouch/include/soundtouch_config.h new file mode 100644 index 000000000..9d2b65817 --- /dev/null +++ b/mac/config/i386/lib-src/soundtouch/include/soundtouch_config.h @@ -0,0 +1,97 @@ +/* include/soundtouch_config.h. Generated from soundtouch_config.h.in by configure. */ +/* include/soundtouch_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#define HAVE_CPUID_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `m' library (-lm). */ +#define HAVE_LIBM 1 + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#define HAVE_MALLOC 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "soundtouch" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "http://www.surina.net/soundtouch" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "SoundTouch" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "SoundTouch 1.7.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "soundtouch" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.7.0" + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* Do not use x86 optimizations */ +/* #undef SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS */ + +/* Use Float as Sample type */ +#define SOUNDTOUCH_FLOAT_SAMPLES 1 + +/* Use Integer as Sample type */ +/* #undef SOUNDTOUCH_INTEGER_SAMPLES */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "1.7.0" + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to rpl_malloc if the replacement function should be used. */ +/* #undef malloc */ diff --git a/mac/config/i386/lib-src/twolame/libtwolame/config.h b/mac/config/i386/lib-src/twolame/libtwolame/config.h new file mode 100644 index 000000000..c2435f0a1 --- /dev/null +++ b/mac/config/i386/lib-src/twolame/libtwolame/config.h @@ -0,0 +1,105 @@ +/* libtwolame/config.h. Generated from config.h.in by configure. */ +/* libtwolame/config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ASSERT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `m' library (-lm). */ +#define HAVE_LIBM 1 + +/* Define to 1 if you have the `mx' library (-lmx). */ +#define HAVE_LIBMX 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MALLOC_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "twolame" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "twolame-discuss@lists.sourceforge.net" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "twolame" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "twolame 0.3.13" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "twolame" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.3.13" + +/* The size of `float', as computed by sizeof. */ +#define SIZEOF_FLOAT 4 + +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "0.3.13" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif diff --git a/mac/config/i386/src/configunix.h b/mac/config/i386/src/configunix.h new file mode 100644 index 000000000..2afa6107e --- /dev/null +++ b/mac/config/i386/src/configunix.h @@ -0,0 +1,196 @@ +/* src/configunix.h. Generated from configtemplate.h by configure. */ +/* src/configtemplate.h. Generated from configure.ac by autoheader. */ + +/* define if Audacity is being installed under a name other than "audacity", + so it can find the files it needs at runtime */ +#define AUDACITY_NAME "audacity" + +/* Define we are compiling Audacity itself, not an Audacity plug-in */ +#define BUILDING_AUDACITY 1 + +/* Use system FFmpeg library and disable dynamic loading of it. */ +/* #undef DISABLE_DYNAMIC_LOADING_FFMPEG */ + +/* Define if LAME should be linked at compile time */ +/* #undef DISABLE_DYNAMIC_LOADING_LAME */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* Define to enable sse */ +#define ENABLE_SSE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ALLOCA_H 1 + +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#define HAVE_CFLOCALECOPYCURRENT 1 + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#define HAVE_CFPREFERENCESCOPYAPPVALUE 1 + +/* Define to 1 if you have the `clock_gettime' function. */ +/* #undef HAVE_CLOCK_GETTIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define if GTK is available */ +/* #undef HAVE_GTK */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBUDEV_H */ + +/* Define if you have C99's lrint function. */ +#define HAVE_LRINT 1 + +/* Define if you have C99's lrintf function. */ +#define HAVE_LRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `nanosleep' function. */ +/* #undef HAVE_NANOSLEEP */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 or 0, depending whether the compiler supports simple visibility + declarations. */ +#define HAVE_VISIBILITY 1 + +/* define as prefix where Audacity is installed */ +#define INSTALL_PREFIX "/usr/local/" + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "audacity" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "audacity" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "audacity 2.0.6" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "audacity" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "2.0.6" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if Audio Unit plug-ins are enabled (Mac OS X only) */ +#define USE_AUDIO_UNITS 1 + +/* Define if ffmpeg (multi-format import and export) support should be enabled + */ +#define USE_FFMPEG 1 + +/* Define if GStreamer 1 is present */ +/* #undef USE_GSTREAMER */ + +/* Define if LADSPA plug-ins are enabled */ +#define USE_LADSPA 1 + +/* Define if the FLAC library is present */ +#define USE_LIBFLAC 1 + +/* Define if libid3tag is present */ +#define USE_LIBID3TAG 1 + +/* Define if mp3 support is implemented with the libmad library */ +#define USE_LIBMAD 1 + +/* Define if libtwolame (MP2 export) support should be enabled */ +#define USE_LIBTWOLAME 1 + +/* Define if the ogg vorbis decoding library is present */ +#define USE_LIBVORBIS 1 + +/* Define if LV2 support should be enabled */ +#define USE_LV2 1 + +/* Define if midi support should be enabled */ +#define USE_MIDI 1 + +/* Define if Nyquist support should be enabled */ +#define USE_NYQUIST 1 + +/* Define if PortMixer support should be enabled */ +#define USE_PORTMIXER 1 + +/* Define if QuickTime importing is enabled (Mac OS X only) */ +#define USE_QUICKTIME 1 + +/* Define if SBSMS support should be enabled */ +#define USE_SBSMS 1 + +/* Define if SoundTouch support should be enabled */ +#define USE_SOUNDTOUCH 1 + +/* Define if Vamp analysis plugin support should be enabled */ +#define USE_VAMP 1 + +/* Define if VST plug-in support is enabled */ +#define USE_VST 1 + +/* Version number of package */ +#define VERSION "2.0.6" + +/* Placeholder for large file support */ +/* #undef _FILE_OFFSET_BITS */ + +/* We're using cygwin */ +/* #undef __CYGWIN__ */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ diff --git a/mac/wxMac_additions/wxMac-2.8.12-wxaccessible.patch b/mac/wxMac_additions/wxMac-2.8.12-wxaccessible.patch index 54054e6b5..3fb75826a 100644 --- a/mac/wxMac_additions/wxMac-2.8.12-wxaccessible.patch +++ b/mac/wxMac_additions/wxMac-2.8.12-wxaccessible.patch @@ -1,6 +1,6 @@ -diff -wruN orig/wxMac-2.8.12/Makefile.in wxMac-2.8.12/Makefile.in +diff -ruN orig/wxMac-2.8.12/Makefile.in wxMac-2.8.12/Makefile.in --- orig/wxMac-2.8.12/Makefile.in 2011-03-22 07:34:13.000000000 -0500 -+++ wxMac-2.8.12/Makefile.in 2012-03-20 20:59:30.000000000 -0500 ++++ wxMac-2.8.12/Makefile.in 2015-04-21 11:05:15.000000000 -0500 @@ -2170,6 +2170,7 @@ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR) COND_TOOLKIT_MAC_GUI_HDR = \ @@ -89,9 +89,9 @@ diff -wruN orig/wxMac-2.8.12/Makefile.in wxMac-2.8.12/Makefile.in corelib_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/aga.cpp -diff -wruN orig/wxMac-2.8.12/include/wx/access.h wxMac-2.8.12/include/wx/access.h +diff -ruN orig/wxMac-2.8.12/include/wx/access.h wxMac-2.8.12/include/wx/access.h --- orig/wxMac-2.8.12/include/wx/access.h 2011-03-22 07:32:57.000000000 -0500 -+++ wxMac-2.8.12/include/wx/access.h 2012-03-20 20:59:30.000000000 -0500 ++++ wxMac-2.8.12/include/wx/access.h 2015-04-21 11:05:15.000000000 -0500 @@ -371,6 +371,10 @@ #include "wx/msw/ole/access.h" #endif @@ -103,18 +103,18 @@ diff -wruN orig/wxMac-2.8.12/include/wx/access.h wxMac-2.8.12/include/wx/access. #endif // wxUSE_ACCESSIBILITY #endif // _WX_ACCESSBASE_H_ -diff -wruN orig/wxMac-2.8.12/include/wx/mac/access.h wxMac-2.8.12/include/wx/mac/access.h +diff -ruN orig/wxMac-2.8.12/include/wx/mac/access.h wxMac-2.8.12/include/wx/mac/access.h --- orig/wxMac-2.8.12/include/wx/mac/access.h 1969-12-31 18:00:00.000000000 -0600 -+++ wxMac-2.8.12/include/wx/mac/access.h 2012-03-20 20:59:30.000000000 -0500 ++++ wxMac-2.8.12/include/wx/mac/access.h 2015-04-21 11:05:15.000000000 -0500 @@ -0,0 +1,5 @@ +#ifdef __WXMAC_CLASSIC__ +#error "wxAccessible not implemented for Classic build." +#else +#include "wx/mac/carbon/access.h" +#endif -diff -wruN orig/wxMac-2.8.12/include/wx/mac/carbon/access.h wxMac-2.8.12/include/wx/mac/carbon/access.h +diff -ruN orig/wxMac-2.8.12/include/wx/mac/carbon/access.h wxMac-2.8.12/include/wx/mac/carbon/access.h --- orig/wxMac-2.8.12/include/wx/mac/carbon/access.h 1969-12-31 18:00:00.000000000 -0600 -+++ wxMac-2.8.12/include/wx/mac/carbon/access.h 2012-03-20 20:59:30.000000000 -0500 ++++ wxMac-2.8.12/include/wx/mac/carbon/access.h 2015-04-21 11:05:15.000000000 -0500 @@ -0,0 +1,140 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: mac/carbon/access.h @@ -256,10 +256,10 @@ diff -wruN orig/wxMac-2.8.12/include/wx/mac/carbon/access.h wxMac-2.8.12/include + +#endif //_WX_ACCESS_H_ + -diff -wruN orig/wxMac-2.8.12/src/mac/carbon/access.cpp wxMac-2.8.12/src/mac/carbon/access.cpp +diff -ruN orig/wxMac-2.8.12/src/mac/carbon/access.cpp wxMac-2.8.12/src/mac/carbon/access.cpp --- orig/wxMac-2.8.12/src/mac/carbon/access.cpp 1969-12-31 18:00:00.000000000 -0600 -+++ wxMac-2.8.12/src/mac/carbon/access.cpp 2012-03-20 20:59:30.000000000 -0500 -@@ -0,0 +1,3912 @@ ++++ wxMac-2.8.12/src/mac/carbon/access.cpp 2015-04-21 16:07:03.000000000 -0500 +@@ -0,0 +1,3919 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: src/msw/ole/access.cpp +// Purpose: implementation of wxIAccessible and wxAccessible @@ -387,11 +387,13 @@ diff -wruN orig/wxMac-2.8.12/src/mac/carbon/access.cpp wxMac-2.8.12/src/mac/carb + typeCFTypeRef, + sizeof(element), + &element); -+ require_noerr(result, MissingElement); -+ wxASSERT(element != NULL); ++ if (result != noErr) { ++ return result; ++ } + ++ wxASSERT(element != NULL); + if (element == NULL) { -+ goto MissingElement; ++ return result; + } + + UInt64 id; @@ -461,7 +463,6 @@ diff -wruN orig/wxMac-2.8.12/src/mac/carbon/access.cpp wxMac-2.8.12/src/mac/carb + + wxTheApp->MacSetCurrentEvent(formerEvent, formerEventHandlerCallRef); + -+MissingElement: + return result; +} + @@ -536,7 +537,7 @@ diff -wruN orig/wxMac-2.8.12/src/mac/carbon/access.cpp wxMac-2.8.12/src/mac/carb + + CFRelease(elem); + -+ result = noErr; ++ result = noErr; + } + + return result; @@ -633,8 +634,9 @@ diff -wruN orig/wxMac-2.8.12/src/mac/carbon/access.cpp wxMac-2.8.12/src/mac/carb + { + CFMutableArrayRef array; + -+ require_noerr(GetArray(event, array, kEventParamAccessibleAttributeNames), -+ ParameterError); ++ if (GetArray(event, array, kEventParamAccessibleAttributeNames) != noErr) { ++ return result; ++ } + + CFArrayAppendValue(array, kAXRoleAttribute); + CFArrayAppendValue(array, kAXRoleDescriptionAttribute); @@ -769,10 +771,12 @@ diff -wruN orig/wxMac-2.8.12/src/mac/carbon/access.cpp wxMac-2.8.12/src/mac/carb + OSStatus result = CallNextEventHandler(handlerRef, eventRef); + + AXUIElementRef elem = NULL;; -+ require_noerr(event.GetParameter(kEventParamAccessibleObject, -+ typeCFTypeRef, -+ sizeof(elem), -+ &elem), ParameterError); ++ if (event.GetParameter(kEventParamAccessibleObject, ++ typeCFTypeRef, ++ sizeof(elem), ++ &elem) != noErr) { ++ return result; ++ } + + ControlRef ctrl; + UInt64 id; @@ -1098,12 +1102,11 @@ diff -wruN orig/wxMac-2.8.12/src/mac/carbon/access.cpp wxMac-2.8.12/src/mac/carb + { + + CFStringRef attr; -+ Boolean settable = false; + + result = event.GetParameter(kEventParamAccessibleAttributeName, -+ typeCFTypeRef, -+ sizeof(attr), -+ &attr); ++ typeCFTypeRef, ++ sizeof(attr), ++ &attr); + + CFShow(attr); + wxASSERT_MSG(false, wxT("SETNAMED WAS CALLED FOR ITEM")); @@ -1553,7 +1556,9 @@ diff -wruN orig/wxMac-2.8.12/src/mac/carbon/access.cpp wxMac-2.8.12/src/mac/carb + typeHIPoint, + sizeof(pt), + &pt); -+ require_noerr(result, ParameterError); ++ if (result != noErr) { ++ return result; ++ } + + result = eventNotHandledErr; + @@ -3573,6 +3578,8 @@ diff -wruN orig/wxMac-2.8.12/src/mac/carbon/access.cpp wxMac-2.8.12/src/mac/carb + OSStatus result; + CFStringRef attr; + Boolean settable = false; ++ wxAccessible *acc = NULL; ++ wxWindow *w = NULL; + + result = event.GetParameter(kEventParamAccessibleAttributeName, + typeCFStringRef, @@ -3581,8 +3588,8 @@ diff -wruN orig/wxMac-2.8.12/src/mac/carbon/access.cpp wxMac-2.8.12/src/mac/carb + + require_noerr(result, ParameterError); + -+ wxAccessible *acc = GetAccessible(); -+ wxWindow *w = acc->GetWindow(); ++ acc = GetAccessible(); ++ w = acc->GetWindow(); + + if (CFStringCompare(attr, kAXFocusedAttribute, 0) == kCFCompareEqualTo) { + settable = true; @@ -4172,9 +4179,21 @@ diff -wruN orig/wxMac-2.8.12/src/mac/carbon/access.cpp wxMac-2.8.12/src/mac/carb +} + +#endif // wxUSE_OLE && wxUSE_ACCESSIBILITY -diff -wruN orig/wxMac-2.8.12/src/mac/carbon/window.cpp wxMac-2.8.12/src/mac/carbon/window.cpp +diff -ruN orig/wxMac-2.8.12/src/mac/carbon/graphics.cpp wxMac-2.8.12/src/mac/carbon/graphics.cpp +--- orig/wxMac-2.8.12/src/mac/carbon/graphics.cpp 2011-03-22 07:34:35.000000000 -0500 ++++ wxMac-2.8.12/src/mac/carbon/graphics.cpp 2015-04-21 12:14:01.000000000 -0500 +@@ -1069,7 +1069,7 @@ + virtual void Transform( const wxGraphicsMatrixData* matrix ); + + // gets the bounding box enclosing all points (possibly including control points) +- virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *y) const; ++ virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const; + + virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const; + private : +diff -ruN orig/wxMac-2.8.12/src/mac/carbon/window.cpp wxMac-2.8.12/src/mac/carbon/window.cpp --- orig/wxMac-2.8.12/src/mac/carbon/window.cpp 2011-03-22 07:34:36.000000000 -0500 -+++ wxMac-2.8.12/src/mac/carbon/window.cpp 2012-03-20 20:59:30.000000000 -0500 ++++ wxMac-2.8.12/src/mac/carbon/window.cpp 2015-04-21 11:05:15.000000000 -0500 @@ -1229,6 +1229,10 @@ SetInitialSize(size);