Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix -rpath /usr/local/lib issue (cmd line tools 2397) #9

Merged
merged 1 commit into from
Oct 22, 2023
Merged

Fix -rpath /usr/local/lib issue (cmd line tools 2397) #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions MacCAN Monitor.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LD_RUNPATH_SEARCH_PATHS = /usr/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.13;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand Down Expand Up @@ -379,6 +380,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LD_RUNPATH_SEARCH_PATHS = /usr/local/lib;
MACOSX_DEPLOYMENT_TARGET = 10.13;
SDKROOT = macosx;
};
Expand All @@ -393,7 +395,7 @@
GCC_PREFIX_HEADER = "MacCAN Monitor/MacCAN Monitor-Prefix.pch";
INFOPLIST_FILE = "MacCAN Monitor/MacCAN Monitor-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 0.5;
MARKETING_VERSION = 0.5.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.uv-software.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
Expand All @@ -409,7 +411,7 @@
GCC_PREFIX_HEADER = "MacCAN Monitor/MacCAN Monitor-Prefix.pch";
INFOPLIST_FILE = "MacCAN Monitor/MacCAN Monitor-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 0.5;
MARKETING_VERSION = 0.5.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.uv-software.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
Expand Down
64 changes: 32 additions & 32 deletions MacCAN Monitor/Base.lproj/MainMenu.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19455" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19455"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -663,7 +663,7 @@
<rect key="frame" x="20" y="52" width="706" height="438"/>
<clipView key="contentView" id="MH6-vq-JCE">
<rect key="frame" x="1" y="1" width="704" height="436"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="612" id="614">
<rect key="frame" x="0.0" y="0.0" width="704" height="413"/>
Expand All @@ -672,7 +672,7 @@
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn width="60.48828125" minWidth="40" maxWidth="1000" id="620">
<tableColumn width="60" minWidth="40" maxWidth="1000" id="620">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Nr">
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
Expand All @@ -687,7 +687,7 @@
<binding destination="683" name="value" keyPath="arrangedObjects.number" id="689"/>
</connections>
</tableColumn>
<tableColumn width="154.19140625" minWidth="40" maxWidth="1000" id="619">
<tableColumn width="154" minWidth="40" maxWidth="1000" id="619">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Time">
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
Expand All @@ -702,7 +702,7 @@
<binding destination="683" name="value" keyPath="arrangedObjects.timestamp" id="691"/>
</connections>
</tableColumn>
<tableColumn width="49.0390625" minWidth="10" maxWidth="3.4028234663852886e+38" id="618">
<tableColumn width="49" minWidth="10" maxWidth="3.4028234663852886e+38" id="618">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="ID (hex)">
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -717,7 +717,7 @@
<binding destination="683" name="value" keyPath="arrangedObjects.identifier" id="693"/>
</connections>
</tableColumn>
<tableColumn width="39.25390625" minWidth="10" maxWidth="3.4028234663852886e+38" id="617">
<tableColumn width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="617">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Type">
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -732,7 +732,7 @@
<binding destination="683" name="value" keyPath="arrangedObjects.type" id="695"/>
</connections>
</tableColumn>
<tableColumn width="185.734375" minWidth="10" maxWidth="3.4028234663852886e+38" id="616">
<tableColumn width="186" minWidth="10" maxWidth="3.4028234663852886e+38" id="616">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Data (hex)">
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -747,7 +747,7 @@
<binding destination="683" name="value" keyPath="arrangedObjects.data" id="697"/>
</connections>
</tableColumn>
<tableColumn width="189" minWidth="10" maxWidth="3.4028234663852886e+38" id="615">
<tableColumn width="160" minWidth="10" maxWidth="3.4028234663852886e+38" id="615">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Data (ASCII)">
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
Expand Down Expand Up @@ -779,7 +779,7 @@
<autoresizingMask key="autoresizingMask"/>
</tableHeaderView>
</scrollView>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="609">
<textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="609">
<rect key="frame" x="58" y="20" width="672" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="668" id="777"/>
Expand Down Expand Up @@ -859,8 +859,8 @@
<rect key="frame" x="0.0" y="0.0" width="292" height="170"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="546">
<rect key="frame" x="99" y="132" width="65" height="16"/>
<textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="546">
<rect key="frame" x="99" y="131" width="65" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="61" id="558"/>
</constraints>
Expand All @@ -870,16 +870,16 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="545">
<rect key="frame" x="99" y="105" width="65" height="16"/>
<textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="545">
<rect key="frame" x="99" y="103" width="65" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Baud rate" id="550">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="544">
<rect key="frame" x="176" y="126" width="99" height="25"/>
<comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="544">
<rect key="frame" x="175" y="127" width="100" height="23"/>
<constraints>
<constraint firstAttribute="width" constant="96" id="561"/>
</constraints>
Expand All @@ -889,8 +889,8 @@
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</comboBoxCell>
</comboBox>
<comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="543">
<rect key="frame" x="176" y="99" width="99" height="25"/>
<comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="543">
<rect key="frame" x="175" y="99" width="100" height="23"/>
<comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="552">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -909,16 +909,16 @@
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="541">
<rect key="frame" x="59" y="12" width="110" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="96" id="557"/>
</constraints>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="554">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
Gw
</string>
</buttonCell>
<constraints>
<constraint firstAttribute="width" constant="96" id="557"/>
</constraints>
<connections>
<action selector="endConnectSheet:" target="494" id="596"/>
</connections>
Expand All @@ -941,7 +941,7 @@ Gw
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="538">
<textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="538">
<rect key="frame" x="99" y="61" width="65" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Option" id="556">
<font key="font" metaFont="system"/>
Expand Down Expand Up @@ -992,43 +992,43 @@ Gw
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="657">
<rect key="frame" x="174" y="12" width="110" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="96" id="674"/>
</constraints>
<buttonCell key="cell" type="push" title="Transmit" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="664">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<constraints>
<constraint firstAttribute="width" constant="96" id="674"/>
</constraints>
<connections>
<action selector="transmitMessage:" target="494" id="678"/>
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="658">
<rect key="frame" x="60" y="12" width="110" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="96" id="675"/>
</constraints>
<buttonCell key="cell" type="push" title="Close" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="663">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
Gw
</string>
</buttonCell>
<constraints>
<constraint firstAttribute="width" constant="96" id="675"/>
</constraints>
<connections>
<action selector="endTransmitSheet:" target="494" id="677"/>
</connections>
</button>
<comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="660">
<rect key="frame" x="20" y="81" width="260" height="25"/>
<comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="660">
<rect key="frame" x="19" y="82" width="261" height="23"/>
<comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="661">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</comboBoxCell>
</comboBox>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="659">
<rect key="frame" x="18" y="61" width="147" height="16"/>
<textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="659">
<rect key="frame" x="18" y="60" width="147" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="143" id="676"/>
</constraints>
Expand Down