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

Jump to bottom

[macOS] Fix missing libavrdude #454

Merged
merged 1 commit into from
Mar 6, 2024
Merged

[macOS] Fix missing libavrdude #454

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
4 changes: 4 additions & 0 deletions macos/QMK Toolbox.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
3A37607A283E769300C19B3F /* KeyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A376079283E769300C19B3F /* KeyView.swift */; };
3A49F9A5282A92EB00B73DA0 /* MessageType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A49F9A4282A92EB00B73DA0 /* MessageType.swift */; };
3A5A916C28410F53004DD9BD /* USBDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A5A916B28410F53004DD9BD /* USBDevice.swift */; };
3A62519B2B8DEAC600ED674E /* libavrdude.1.0.0.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 3A6251992B8DEA9E00ED674E /* libavrdude.1.0.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3A62C86526A96AED001C655A /* reset_right.eep in Resources */ = {isa = PBXBuildFile; fileRef = 3A62C86326A96AED001C655A /* reset_right.eep */; };
3A62C86626A96AED001C655A /* reset_left.eep in Resources */ = {isa = PBXBuildFile; fileRef = 3A62C86426A96AED001C655A /* reset_left.eep */; };
3A708D982848A23300394E52 /* USBListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A708D972848A23300394E52 /* USBListener.swift */; };
Expand Down Expand Up @@ -86,6 +87,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
3A62519B2B8DEAC600ED674E /* libavrdude.1.0.0.dylib in Embed Libraries */,
3066649428392281007C93C8 /* libftdi1.2.5.0.dylib in Embed Libraries */,
3066649628392281007C93C8 /* libhidapi.0.14.0.dylib in Embed Libraries */,
3066649828392281007C93C8 /* libusb-0.1.4.dylib in Embed Libraries */,
Expand Down Expand Up @@ -128,6 +130,7 @@
3A376079283E769300C19B3F /* KeyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyView.swift; sourceTree = "<group>"; };
3A49F9A4282A92EB00B73DA0 /* MessageType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageType.swift; sourceTree = "<group>"; };
3A5A916B28410F53004DD9BD /* USBDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = USBDevice.swift; sourceTree = "<group>"; };
3A6251992B8DEA9E00ED674E /* libavrdude.1.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libavrdude.1.0.0.dylib; sourceTree = "<group>"; };
3A62C86326A96AED001C655A /* reset_right.eep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = reset_right.eep; path = ../../../common/reset_right.eep; sourceTree = "<group>"; };
3A62C86426A96AED001C655A /* reset_left.eep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = reset_left.eep; path = ../../../common/reset_left.eep; sourceTree = "<group>"; };
3A708D972848A23300394E52 /* USBListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = USBListener.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -237,6 +240,7 @@
C9A09B5622EE6826008C3CF3 /* mdloader */,
0929640E1F5E4068004F2D3F /* teensy_loader_cli */,
9BE10717275F4CFE00C708D5 /* wb32-dfu-updater_cli */,
3A6251992B8DEA9E00ED674E /* libavrdude.1.0.0.dylib */,
3A7770D822BD3B8200398C40 /* libftdi1.2.5.0.dylib */,
3AFD4BCF281AB83C00ADCB65 /* libhidapi.0.14.0.dylib */,
09D79CBB1FB8A6490086ABF6 /* libusb-0.1.4.dylib */,
Expand Down
14 changes: 7 additions & 7 deletions macos/QMK Toolbox/Base.lproj/Main.storyboard
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.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="bqF-op-bMF">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="bqF-op-bMF">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -326,7 +326,7 @@
<rect key="frame" x="4" y="5" width="778" height="34"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RyP-fO-7kx">
<comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RyP-fO-7kx">
<rect key="frame" x="7" y="6" width="579" height="21"/>
<comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Click Open or drag to window to select file" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="loT-oz-kzc">
<font key="font" metaFont="cellTitle"/>
Expand All @@ -347,7 +347,7 @@
<action selector="openButtonClick:" target="9uD-mB-xHs" id="nJc-eW-jYh"/>
</connections>
</button>
<comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0Ph-Pe-wCm" customClass="MicrocontrollerSelector" customModule="QMK_Toolbox" customModuleProvider="target">
<comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0Ph-Pe-wCm" customClass="MicrocontrollerSelector" customModule="QMK_Toolbox" customModuleProvider="target">
<rect key="frame" x="649" y="6" width="124" height="21"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="L3g-2e-wKZ"/>
Expand Down Expand Up @@ -519,7 +519,7 @@
<rect key="frame" x="0.0" y="0.0" width="640" height="480"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Wcn-4s-O2b">
<comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Wcn-4s-O2b">
<rect key="frame" x="9" y="448" width="624" height="23"/>
<comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="No HID console devices connected" drawsBackground="YES" buttonBordered="NO" completes="NO" numberOfVisibleItems="5" id="6WM-Ih-xnI">
<font key="font" metaFont="system"/>
Expand Down Expand Up @@ -1784,15 +1784,15 @@ down</string>
<userDefinedRuntimeAttribute type="string" keyPath="legend" value="enter"/>
</userDefinedRuntimeAttributes>
</customView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4Xq-l8-2Gv">
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4Xq-l8-2Gv">
<rect key="frame" x="722" y="140" width="140" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Last VK: -" id="YVz-io-kv8">
<font key="font" usesAppearanceFont="YES"/>
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iwr-Dd-3bo">
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iwr-Dd-3bo">
<rect key="frame" x="722" y="122" width="140" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Flags: -" id="9ep-QN-36O">
<font key="font" usesAppearanceFont="YES"/>
Expand Down
Binary file modified macos/QMK Toolbox/Resources/avrdude
View file
Open in desktop
Binary file not shown.
Binary file added macos/QMK Toolbox/Resources/libavrdude.1.0.0.dylib
View file
Open in desktop
Binary file not shown.