Skip to content

Commit c977173

Browse files
committed
Set MACOSX_DEPLOYMENT_TARGET (i.e. the minimum supported OS X version) to 10.9. Pass -Wpartial-availability to the compiler so it will warn about usage of API's that aren't available on all supported OS X versions. Removed /opt/local and /usr/local from OS X header and library search paths, as they're used only by specific plugins and not needed generally.
1 parent 9f3d1f9 commit c977173

3 files changed

Lines changed: 13 additions & 15 deletions

File tree

Builds/MacOSX/Plugins/Config/Plugin.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ GCC_WARN_UNUSED_FUNCTION = YES
3838
GCC_WARN_UNUSED_VARIABLE = YES
3939
HEADER_SEARCH_PATHS = ../../../../Source/Plugins/Headers $(inherited)
4040
INSTALL_PATH = $(HOME)/Applications/open-ephys.app/Contents/PlugIns
41-
MACOSX_DEPLOYMENT_TARGET = 10.11
41+
MACOSX_DEPLOYMENT_TARGET = 10.9
4242
OTHER_LDFLAGS = $(inherited) -undefined dynamic_lookup
4343
SDKROOT = macosx
4444
SKIP_INSTALL = YES
45-
WARNING_CFLAGS = $(inherited) -Wreorder -Wno-inconsistent-missing-override
45+
WARNING_CFLAGS = $(inherited) -Wpartial-availability -Wreorder -Wno-inconsistent-missing-override
4646
WRAPPER_EXTENSION = bundle

Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2690,12 +2690,12 @@
26902690
"JUCE_APP_VERSION=0.4.0",
26912691
"JUCE_APP_VERSION_HEX=0x400", );
26922692
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
2693-
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "/opt/local/include", "/usr/local/include", "$(inherited)");
2693+
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "$(inherited)");
26942694
INFOPLIST_FILE = Info.plist;
26952695
INSTALL_PATH = "$(HOME)/Applications";
2696-
LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"/opt/local/lib\"", "\"/usr/local/lib\"");
2696+
MACOSX_DEPLOYMENT_TARGET = 10.9;
26972697
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
2698-
OTHER_CPLUSPLUSFLAGS = "-fPIC -Wno-inconsistent-missing-override";
2698+
OTHER_CPLUSPLUSFLAGS = "-fPIC -Wpartial-availability -Wno-inconsistent-missing-override";
26992699
OTHER_LDFLAGS = "-ldl -fPIC -rdynamic";
27002700
SDKROOT_ppc = macosx10.5; }; name = Debug; };
27012701
7A6F9B742B69F66DC3E29FA8 = {isa = XCBuildConfiguration; buildSettings = {
@@ -2714,12 +2714,12 @@
27142714
"JUCE_APP_VERSION_HEX=0x400", );
27152715
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
27162716
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
2717-
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "/opt/local/include", "/usr/local/include", "$(inherited)");
2717+
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "$(inherited)");
27182718
INFOPLIST_FILE = Info.plist;
27192719
INSTALL_PATH = "$(HOME)/Applications";
2720-
LIBRARY_SEARCH_PATHS = ("$(inherited)", "\"/opt/local/lib\"", "\"/usr/local/lib\"");
2720+
MACOSX_DEPLOYMENT_TARGET = 10.9;
27212721
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
2722-
OTHER_CPLUSPLUSFLAGS = "-fPIC -Wno-inconsistent-missing-override";
2722+
OTHER_CPLUSPLUSFLAGS = "-fPIC -Wpartial-availability -Wno-inconsistent-missing-override";
27232723
OTHER_LDFLAGS = "-ldl -fPIC -rdynamic";
27242724
SDKROOT_ppc = macosx10.5; }; name = Release; };
27252725
C8018C9A4DA633CA60663294 = {isa = XCBuildConfiguration; buildSettings = {

open-ephys.jucer

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,16 @@
1313
<EXPORTFORMATS>
1414
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
1515
extraLinkerFlags="-ldl -fPIC -rdynamic" objCExtraSuffix="fea2mT"
16-
extraDefs="" extraCompilerFlags="-fPIC -Wno-inconsistent-missing-override"
16+
extraDefs="" extraCompilerFlags="-fPIC -Wpartial-availability -Wno-inconsistent-missing-override"
1717
postbuildCommand="# Copy Rhythm-related files to application bundle's Resources folder&#10;srcdir=&quot;${PROJECT_DIR}/../../Resources&quot;&#10;dstdir=&quot;${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}&quot;&#10;/usr/bin/rsync -a &quot;$srcdir/Bitfiles/rhd2000.bit&quot; &quot;$srcdir/Bitfiles/rhd2000_usb3.bit&quot; &quot;$srcdir/DLLs/libokFrontPanel.dylib&quot; &quot;$dstdir&quot;"
1818
smallIcon="txUyO4" bigIcon="nFMauU">
1919
<CONFIGURATIONS>
2020
<CONFIGURATION name="Debug" isDebug="1" optimisation="3" targetName="open-ephys"
21-
osxSDK="default" osxCompatibility="default" osxArchitecture="default"
22-
headerPath="/opt/local/include&#10;/usr/local/include" libraryPath="/opt/local/lib&#10;/usr/local/lib"
23-
defines=""/>
21+
osxSDK="default" osxCompatibility="10.9 SDK" osxArchitecture="default"
22+
headerPath="" libraryPath="" defines=""/>
2423
<CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="open-ephys"
25-
osxSDK="default" osxCompatibility="default" osxArchitecture="default"
26-
headerPath="/opt/local/include&#10;/usr/local/include" libraryPath="/opt/local/lib&#10;/usr/local/lib"
27-
defines=""/>
24+
osxSDK="default" osxCompatibility="10.9 SDK" osxArchitecture="default"
25+
headerPath="" libraryPath="" defines=""/>
2826
</CONFIGURATIONS>
2927
<MODULEPATHS>
3028
<MODULEPATH id="juce_video" path="JuceLibraryCode/modules"/>

0 commit comments

Comments
 (0)