Skip to content

Commit 8e6f71a

Browse files
author
dsward2
committed
Changes in preparation for macOS 10.15 Catalina -
In the sox project, the build settings were changed for 64-bit architecture. libltdl was added to the application bundle from MacPorts, and the executable_path from sox to libltdl was updated. The build process for the stereodaemux sub-project now uses the build_stereodemux.sh script.
1 parent eec6a3a commit 8e6f71a

15 files changed

Lines changed: 494 additions & 456 deletions

File tree

‎AudioMonitor/AudioMonitor.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
TargetAttributes = {
182182
0E02EC341F494F7C008BAC27 = {
183183
CreatedOnToolsVersion = 8.2.1;
184-
DevelopmentTeam = MMFBWVS455;
184+
DevelopmentTeam = AM3K5RX83D;
185185
ProvisioningStyle = Manual;
186186
};
187187
0EB51DED212D3E2F0059D84C = {
@@ -195,6 +195,7 @@
195195
developmentRegion = English;
196196
hasScannedForEncodings = 0;
197197
knownRegions = (
198+
English,
198199
en,
199200
);
200201
mainGroup = 0E02EC2C1F494F7C008BAC27;
@@ -342,7 +343,7 @@
342343
buildSettings = {
343344
CODE_SIGN_ENTITLEMENTS = AudioMonitor.entitlements;
344345
CODE_SIGN_IDENTITY = "-";
345-
DEVELOPMENT_TEAM = MMFBWVS455;
346+
DEVELOPMENT_TEAM = AM3K5RX83D;
346347
MACOSX_DEPLOYMENT_TARGET = 10.11;
347348
PRODUCT_NAME = "$(TARGET_NAME)";
348349
};
@@ -353,7 +354,7 @@
353354
buildSettings = {
354355
CODE_SIGN_ENTITLEMENTS = AudioMonitor.entitlements;
355356
CODE_SIGN_IDENTITY = "-";
356-
DEVELOPMENT_TEAM = MMFBWVS455;
357+
DEVELOPMENT_TEAM = AM3K5RX83D;
357358
MACOSX_DEPLOYMENT_TARGET = 10.11;
358359
PRODUCT_NAME = "$(TARGET_NAME)";
359360
};

‎LocalRadio.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
0E3CB0E71F65FAD50088B498 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 0E3CB0E61F65FAD50088B498 /* README.md */; };
3232
0E3CB0E91F679AB40088B498 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 0E3CB0E81F679AB40088B498 /* LICENSE */; };
3333
0E49700F1F70F74D00E41A06 /* AudioMonitor in Copy Tools */ = {isa = PBXBuildFile; fileRef = 0E02EC441F494F7E008BAC27 /* AudioMonitor */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
34+
0E4D1393231641B10064D172 /* libliquid.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = 0E4D13922316413D0064D172 /* libliquid.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3435
0E4ECFC01EAB633B00D2157B /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E4ECFBF1EAB633B00D2157B /* AppDelegate.m */; };
3536
0E4ECFC31EAB633B00D2157B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E4ECFC21EAB633B00D2157B /* main.m */; };
3637
0E4ECFC81EAB633B00D2157B /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0E4ECFC61EAB633B00D2157B /* MainMenu.xib */; };
@@ -50,7 +51,7 @@
5051
0E4ED1961EAB7ED700D2157B /* DDRange.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E4ED05F1EAB7D5300D2157B /* DDRange.m */; };
5152
0E4ED1AD1EAB823B00D2157B /* HTTPWebServerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E4ED1AC1EAB823B00D2157B /* HTTPWebServerController.m */; };
5253
0E560FAA21FB04E4007C6DB3 /* sox git and build notes.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0E560FA921FB04E4007C6DB3 /* sox git and build notes.txt */; };
53-
0E56117321FBD899007C6DB3 /* libliquid.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = 0E56117121FBD26E007C6DB3 /* libliquid.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
54+
0E56117321FBD899007C6DB3 /* libltdl.7.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = 0E56117121FBD26E007C6DB3 /* libltdl.7.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
5455
0E56117621FBDC77007C6DB3 /* libsndfile.1.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = 0E56117521FBDC6B007C6DB3 /* libsndfile.1.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
5556
0E56117821FBDD6A007C6DB3 /* libfftw3f.3.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = 0E56117721FBDD3D007C6DB3 /* libfftw3f.3.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
5657
0E56117A21FBDD81007C6DB3 /* libFLAC.8.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = 0E56117921FBDD7D007C6DB3 /* libFLAC.8.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
@@ -800,8 +801,9 @@
800801
0E82BE9F220104A50042D275 /* libicudata.58.2.dylib in Copy Libraries */,
801802
0E82BEA0220104A90042D275 /* libicui18n.58.2.dylib in Copy Libraries */,
802803
0E82BEA1220104AC0042D275 /* libicuuc.58.2.dylib in Copy Libraries */,
803-
0E56117321FBD899007C6DB3 /* libliquid.dylib in Copy Libraries */,
804+
0E56117321FBD899007C6DB3 /* libltdl.7.dylib in Copy Libraries */,
804805
0EF88F0D21F06E65008720D5 /* libogg.0.dylib in Copy Libraries */,
806+
0E4D1393231641B10064D172 /* libliquid.dylib in Copy Libraries */,
805807
0E82BEA3220108680042D275 /* librtlsdr.0.dylib in Copy Libraries */,
806808
0EA3EB7221FD848200DF4099 /* libsox.3.dylib in Copy Libraries */,
807809
0E56117621FBDC77007C6DB3 /* libsndfile.1.dylib in Copy Libraries */,
@@ -1243,6 +1245,7 @@
12431245
0E496FEC1F6DBFE700E41A06 /* credits.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = credits.html; sourceTree = "<group>"; };
12441246
0E4970041F6E180F00E41A06 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
12451247
0E49700B1F70C8B900E41A06 /* fix_rtl_sdr_tools.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = fix_rtl_sdr_tools.sh; sourceTree = "<group>"; };
1248+
0E4D13922316413D0064D172 /* libliquid.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libliquid.dylib; path = Libraries_Modified/libliquid.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
12461249
0E4ECFBB1EAB633B00D2157B /* LocalRadio.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LocalRadio.app; sourceTree = BUILT_PRODUCTS_DIR; };
12471250
0E4ECFBE1EAB633B00D2157B /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
12481251
0E4ECFBF1EAB633B00D2157B /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -2163,7 +2166,7 @@
21632166
0E56116E21FB05A3007C6DB3 /* responseAB */ = {isa = PBXFileReference; lastKnownFileType = text; path = responseAB; sourceTree = "<group>"; };
21642167
0E56116F21FB05A3007C6DB3 /* wtest.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = wtest.pl; sourceTree = "<group>"; };
21652168
0E56117021FB05A3007C6DB3 /* update_debian_version.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = update_debian_version.pl; sourceTree = "<group>"; };
2166-
0E56117121FBD26E007C6DB3 /* libliquid.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libliquid.dylib; path = Libraries_Modified/libliquid.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
2169+
0E56117121FBD26E007C6DB3 /* libltdl.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libltdl.7.dylib; path = Libraries_Modified/libltdl.7.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
21672170
0E56117521FBDC6B007C6DB3 /* libsndfile.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsndfile.1.dylib; path = Libraries_Modified/libsndfile.1.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
21682171
0E56117721FBDD3D007C6DB3 /* libfftw3f.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfftw3f.3.dylib; path = Libraries_Modified/libfftw3f.3.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
21692172
0E56117921FBDD7D007C6DB3 /* libFLAC.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libFLAC.8.dylib; path = Libraries_Modified/libFLAC.8.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -3010,7 +3013,8 @@
30103013
0E82BE9B220103B50042D275 /* libicudata.58.2.dylib */,
30113014
0E82BE9C220103FF0042D275 /* libicui18n.58.2.dylib */,
30123015
0E82BE9D220104350042D275 /* libicuuc.58.2.dylib */,
3013-
0E56117121FBD26E007C6DB3 /* libliquid.dylib */,
3016+
0E4D13922316413D0064D172 /* libliquid.dylib */,
3017+
0E56117121FBD26E007C6DB3 /* libltdl.7.dylib */,
30143018
0E274E9121DDCCC200337560 /* libogg.0.dylib */,
30153019
0E82BEA22201084A0042D275 /* librtlsdr.0.dylib */,
30163020
0EA3EB7121FD846300DF4099 /* libsox.3.dylib */,

‎LocalRadio/Scripts/fix_rtl_fm_localradio.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,13 @@ echo "Modify executable_path to libusb in rtl_fm_localradio"
1919
echo install_name_tool -change /opt/local/lib/libusb-1.0.0.dylib @executable_path/../Frameworks/libusb-1.0.0.dylib ${BUILT_PRODUCTS_DIR}/rtl_fm_localradio
2020

2121
install_name_tool -change /opt/local/lib/libusb-1.0.0.dylib @executable_path/../Frameworks/libusb-1.0.0.dylib ${BUILT_PRODUCTS_DIR}/rtl_fm_localradio
22+
23+
echo "Modify executable_path to libltdl in sox and libsox.3.dylib"
24+
25+
echo install_name_tool -change /usr/local/opt/libtool/lib/libltdl.7.dylib @executable_path/../Frameworks/libltdl.7.dylib ${BUILT_PRODUCTS_DIR}/sox
26+
27+
install_name_tool -change /usr/local/opt/libtool/lib/libltdl.7.dylib @executable_path/../Frameworks/libltdl.7.dylib ${BUILT_PRODUCTS_DIR}/sox
28+
29+
echo install_name_tool -change /usr/local/opt/libtool/lib/libltdl.7.dylib @executable_path/../Frameworks/libltdl.7.dylib ${BUILT_PRODUCTS_DIR}/Libraries_Modified/libsox.3.dylib
30+
31+
install_name_tool -change /usr/local/opt/libtool/lib/libltdl.7.dylib @executable_path/../Frameworks/libltdl.7.dylib ${BUILT_PRODUCTS_DIR}/Libraries_Modified/libsox.3.dylib

‎rtl_fm_localradio/rtl_fm_localradio.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@
146146
developmentRegion = English;
147147
hasScannedForEncodings = 0;
148148
knownRegions = (
149+
English,
149150
en,
150151
);
151152
mainGroup = 0E0C690D1F1C8C8E00A7EE5E;
@@ -171,7 +172,7 @@
171172
);
172173
runOnlyForDeploymentPostprocessing = 0;
173174
shellPath = /bin/sh;
174-
shellScript = "echo bash ${SRCROOT}/../LocalRadio/Scripts/fix_rtl_fm_localradio.sh\n\nbash ${SRCROOT}/../LocalRadio/Scripts/fix_rtl_fm_localradio.sh";
175+
shellScript = "echo bash ${SRCROOT}/../LocalRadio/Scripts/fix_rtl_fm_localradio.sh\n\nbash ${SRCROOT}/../LocalRadio/Scripts/fix_rtl_fm_localradio.sh\n";
175176
};
176177
/* End PBXShellScriptBuildPhase section */
177178

‎sox/sox git and build notes.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cd sox/externals/sox
2222

2323
autoreconf -i
2424

25-
./configure --with-coreaudio --without-magic --without-png --without-ladspa --without-mad --without-id3tag --without-lame --without-twolame --without-oggvorbis --without-opus --without-flac --without-amrwb --without-amrnb --without-wavpack --without-sndfile --without-mp3 --without-gsm --without-lpc10 --without-sndio --without-alsa --without-ao --without-pulseaudio --without-waveaudio --without-oss --without-sunaudio CFLAGS="-arch i386" LDFLAGS="-arch i386"
25+
./configure --with-coreaudio --without-magic --without-png --without-ladspa --without-mad --without-id3tag --without-lame --without-twolame --without-oggvorbis --without-opus --without-flac --without-amrwb --without-amrnb --without-wavpack --without-sndfile --without-mp3 --without-gsm --without-lpc10 --without-sndio --without-alsa --without-ao --without-pulseaudio --without-waveaudio --without-oss --without-sunaudio CFLAGS="-arch x86_64" LDFLAGS="-arch x86_64"
2626

2727
make -s
2828

0 commit comments

Comments
 (0)