diff --git a/macos/QMK Toolbox.xcodeproj/project.pbxproj b/macos/QMK Toolbox.xcodeproj/project.pbxproj index d105b48cc8..37ad9a48f1 100644 --- a/macos/QMK Toolbox.xcodeproj/project.pbxproj +++ b/macos/QMK Toolbox.xcodeproj/project.pbxproj @@ -8,16 +8,7 @@ /* Begin PBXBuildFile section */ 092964021F5C8B2C004F2D3F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 092964011F5C8B2C004F2D3F /* Assets.xcassets */; }; - 0929640D1F5E403C004F2D3F /* dfu-programmer in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0929640C1F5E403C004F2D3F /* dfu-programmer */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 0929640F1F5E4068004F2D3F /* teensy_loader_cli in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0929640E1F5E4068004F2D3F /* teensy_loader_cli */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 092964111F5E4186004F2D3F /* avrdude in CopyFiles */ = {isa = PBXBuildFile; fileRef = 092964101F5E4186004F2D3F /* avrdude */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 09522BB31F61E32700AEBC5E /* mcu-list.txt in Resources */ = {isa = PBXBuildFile; fileRef = 09522BB21F61E32700AEBC5E /* mcu-list.txt */; }; - 09522BBB1F6216BA00AEBC5E /* avrdude.conf in Resources */ = {isa = PBXBuildFile; fileRef = 09522BBA1F6216BA00AEBC5E /* avrdude.conf */; }; - 098AEDFB1F5E45C300CA054D /* dfu-util in CopyFiles */ = {isa = PBXBuildFile; fileRef = 098AEDFA1F5E45C300CA054D /* dfu-util */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 3066649428392281007C93C8 /* libftdi1.2.5.0.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 3A7770D822BD3B8200398C40 /* libftdi1.2.5.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 3066649628392281007C93C8 /* libhidapi.0.14.0.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 3AFD4BCF281AB83C00ADCB65 /* libhidapi.0.14.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 3066649828392281007C93C8 /* libusb-0.1.4.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 09D79CBB1FB8A6490086ABF6 /* libusb-0.1.4.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 3066649A28392281007C93C8 /* libusb-1.0.0.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 09D79CB51FB0DD7F0086ABF6 /* libusb-1.0.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 3A128567283D3F0800173A80 /* MicrocontrollerSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A128566283D3F0800173A80 /* MicrocontrollerSelector.swift */; }; 3A32CF4B28412C420016D7B7 /* BootloaderDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A32CF4A28412C420016D7B7 /* BootloaderDevice.swift */; }; 3A32CF4D28413E6B0016D7B7 /* HalfKayDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A32CF4C28413E6B0016D7B7 /* HalfKayDevice.swift */; }; @@ -38,13 +29,11 @@ 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 */; }; 3A708D9A284901F500394E52 /* HIDListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A708D99284901F500394E52 /* HIDListener.swift */; }; 3A708D9C284916F700394E52 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A708D9B284916F700394E52 /* AppDelegate.swift */; }; - 3A7492CC27DF96BF0073A5A0 /* hid_bootloader_cli in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3A7492CB27DF96BF0073A5A0 /* hid_bootloader_cli */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 3A8DE01A284636780012063A /* HIDConsoleDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A8DE019284636780012063A /* HIDConsoleDevice.swift */; }; 3A8F9F0226E7501E007480A7 /* KeyView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A8F9F0426E7501E007480A7 /* KeyView.xib */; }; 3A92871E292CE6400015D961 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A92871D292CE6400015D961 /* MainViewController.swift */; }; @@ -56,60 +45,15 @@ 3AA7F96B283BCD2E009FFDD5 /* BootloaderType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA7F96A283BCD2E009FFDD5 /* BootloaderType.swift */; }; 3AAB20AB283BEEC700029ABD /* LogTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAB20AA283BEEC700029ABD /* LogTextView.swift */; }; 3AB09F1D28B46672006CC212 /* GD32VDFUDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AB09F1C28B46672006CC212 /* GD32VDFUDevice.swift */; }; - 3AB4BC9D2495540A00204A3F /* bootloadHID in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3AB4BC9C2495540A00204A3F /* bootloadHID */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 3AE86EF8294C9CEC00008D3E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3AE86EFA294C9CEC00008D3E /* Main.storyboard */; }; - 9BE10718275F4CFE00C708D5 /* wb32-dfu-updater_cli in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BE10717275F4CFE00C708D5 /* wb32-dfu-updater_cli */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; C93A0FF42292232E0006C88F /* reset.eep in Resources */ = {isa = PBXBuildFile; fileRef = C93A0FF32292232D0006C88F /* reset.eep */; }; - C9A09B5722EE6826008C3CF3 /* mdloader in CopyFiles */ = {isa = PBXBuildFile; fileRef = C9A09B5622EE6826008C3CF3 /* mdloader */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 3066649128392231007C93C8 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 7; - files = ( - 092964111F5E4186004F2D3F /* avrdude in CopyFiles */, - 3AB4BC9D2495540A00204A3F /* bootloadHID in CopyFiles */, - 0929640D1F5E403C004F2D3F /* dfu-programmer in CopyFiles */, - 098AEDFB1F5E45C300CA054D /* dfu-util in CopyFiles */, - 3A7492CC27DF96BF0073A5A0 /* hid_bootloader_cli in CopyFiles */, - C9A09B5722EE6826008C3CF3 /* mdloader in CopyFiles */, - 0929640F1F5E4068004F2D3F /* teensy_loader_cli in CopyFiles */, - 9BE10718275F4CFE00C708D5 /* wb32-dfu-updater_cli in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 3066649B28392281007C93C8 /* Embed Libraries */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - 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 */, - 3066649A28392281007C93C8 /* libusb-1.0.0.dylib in Embed Libraries */, - ); - name = "Embed Libraries"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 092963F81F5C8B2C004F2D3F /* QMK Toolbox.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "QMK Toolbox.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 092964011F5C8B2C004F2D3F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 092964061F5C8B2C004F2D3F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 0929640C1F5E403C004F2D3F /* dfu-programmer */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "dfu-programmer"; sourceTree = ""; }; - 0929640E1F5E4068004F2D3F /* teensy_loader_cli */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = teensy_loader_cli; sourceTree = ""; }; - 092964101F5E4186004F2D3F /* avrdude */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = avrdude; sourceTree = ""; }; 09522BB21F61E32700AEBC5E /* mcu-list.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "mcu-list.txt"; path = "../../../common/mcu-list.txt"; sourceTree = ""; }; - 09522BBA1F6216BA00AEBC5E /* avrdude.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = avrdude.conf; path = ../../../common/avrdude.conf; sourceTree = ""; }; - 098AEDFA1F5E45C300CA054D /* dfu-util */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "dfu-util"; sourceTree = ""; }; - 09D79CB51FB0DD7F0086ABF6 /* libusb-1.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = "libusb-1.0.0.dylib"; sourceTree = ""; }; - 09D79CBB1FB8A6490086ABF6 /* libusb-0.1.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = "libusb-0.1.4.dylib"; sourceTree = ""; }; 3A128566283D3F0800173A80 /* MicrocontrollerSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MicrocontrollerSelector.swift; sourceTree = ""; }; 3A32CF4A28412C420016D7B7 /* BootloaderDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BootloaderDevice.swift; sourceTree = ""; }; 3A32CF4C28413E6B0016D7B7 /* HalfKayDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HalfKayDevice.swift; sourceTree = ""; }; @@ -130,14 +74,11 @@ 3A376079283E769300C19B3F /* KeyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyView.swift; sourceTree = ""; }; 3A49F9A4282A92EB00B73DA0 /* MessageType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageType.swift; sourceTree = ""; }; 3A5A916B28410F53004DD9BD /* USBDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = USBDevice.swift; sourceTree = ""; }; - 3A6251992B8DEA9E00ED674E /* libavrdude.1.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libavrdude.1.0.0.dylib; sourceTree = ""; }; 3A62C86326A96AED001C655A /* reset_right.eep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = reset_right.eep; path = ../../../common/reset_right.eep; sourceTree = ""; }; 3A62C86426A96AED001C655A /* reset_left.eep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = reset_left.eep; path = ../../../common/reset_left.eep; sourceTree = ""; }; 3A708D972848A23300394E52 /* USBListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = USBListener.swift; sourceTree = ""; }; 3A708D99284901F500394E52 /* HIDListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HIDListener.swift; sourceTree = ""; }; 3A708D9B284916F700394E52 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 3A7492CB27DF96BF0073A5A0 /* hid_bootloader_cli */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = hid_bootloader_cli; sourceTree = ""; }; - 3A7770D822BD3B8200398C40 /* libftdi1.2.5.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libftdi1.2.5.0.dylib; sourceTree = ""; }; 3A8DE019284636780012063A /* HIDConsoleDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HIDConsoleDevice.swift; sourceTree = ""; }; 3A8F9F0326E7501E007480A7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/KeyView.xib; sourceTree = ""; }; 3A92871D292CE6400015D961 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = ""; }; @@ -149,24 +90,10 @@ 3AA7F96A283BCD2E009FFDD5 /* BootloaderType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BootloaderType.swift; sourceTree = ""; }; 3AAB20AA283BEEC700029ABD /* LogTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogTextView.swift; sourceTree = ""; }; 3AB09F1C28B46672006CC212 /* GD32VDFUDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GD32VDFUDevice.swift; sourceTree = ""; }; - 3AB4BC9C2495540A00204A3F /* bootloadHID */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = bootloadHID; sourceTree = ""; }; 3AE86EF9294C9CEC00008D3E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 3AFD4BCF281AB83C00ADCB65 /* libhidapi.0.14.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libhidapi.0.14.0.dylib; sourceTree = ""; }; - 9BE10717275F4CFE00C708D5 /* wb32-dfu-updater_cli */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "wb32-dfu-updater_cli"; sourceTree = ""; }; C93A0FF32292232D0006C88F /* reset.eep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = reset.eep; path = ../../../common/reset.eep; sourceTree = ""; }; - C9A09B5622EE6826008C3CF3 /* mdloader */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = mdloader; sourceTree = ""; }; /* End PBXFileReference section */ -/* Begin PBXFrameworksBuildPhase section */ - 092963F51F5C8B2C004F2D3F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - /* Begin PBXGroup section */ 092963EF1F5C8B2C004F2D3F = { isa = PBXGroup; @@ -227,24 +154,10 @@ 3A53FB5B268A33F10020BAB0 /* Resources */ = { isa = PBXGroup; children = ( - 09522BBA1F6216BA00AEBC5E /* avrdude.conf */, 09522BB21F61E32700AEBC5E /* mcu-list.txt */, C93A0FF32292232D0006C88F /* reset.eep */, 3A62C86426A96AED001C655A /* reset_left.eep */, 3A62C86326A96AED001C655A /* reset_right.eep */, - 092964101F5E4186004F2D3F /* avrdude */, - 3AB4BC9C2495540A00204A3F /* bootloadHID */, - 0929640C1F5E403C004F2D3F /* dfu-programmer */, - 098AEDFA1F5E45C300CA054D /* dfu-util */, - 3A7492CB27DF96BF0073A5A0 /* hid_bootloader_cli */, - 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 */, - 09D79CB51FB0DD7F0086ABF6 /* libusb-1.0.0.dylib */, ); path = Resources; sourceTree = ""; @@ -302,10 +215,7 @@ buildConfigurationList = 092964091F5C8B2C004F2D3F /* Build configuration list for PBXNativeTarget "QMK Toolbox" */; buildPhases = ( 092963F41F5C8B2C004F2D3F /* Sources */, - 092963F51F5C8B2C004F2D3F /* Frameworks */, 092963F61F5C8B2C004F2D3F /* Resources */, - 3066649128392231007C93C8 /* CopyFiles */, - 3066649B28392281007C93C8 /* Embed Libraries */, ); buildRules = ( ); @@ -359,7 +269,6 @@ 3AA5D3472803FCE1008121E4 /* Colors.xcassets in Resources */, 3AE86EF8294C9CEC00008D3E /* Main.storyboard in Resources */, 3A8F9F0226E7501E007480A7 /* KeyView.xib in Resources */, - 09522BBB1F6216BA00AEBC5E /* avrdude.conf in Resources */, 09522BB31F61E32700AEBC5E /* mcu-list.txt in Resources */, C93A0FF42292232E0006C88F /* reset.eep in Resources */, 3A62C86626A96AED001C655A /* reset_left.eep in Resources */, @@ -560,16 +469,6 @@ COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; INFOPLIST_FILE = "QMK Toolbox/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(PROJECT_DIR)/QMK Toolbox\"", - "$(PROJECT_DIR)", - "$(PROJECT_DIR)/QMK\\ Toolbox/Resources", - ); PRODUCT_BUNDLE_IDENTIFIER = fm.qmk.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -585,16 +484,6 @@ COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; INFOPLIST_FILE = "QMK Toolbox/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(PROJECT_DIR)/QMK Toolbox\"", - "$(PROJECT_DIR)", - "$(PROJECT_DIR)/QMK\\ Toolbox/Resources", - ); PRODUCT_BUNDLE_IDENTIFIER = fm.qmk.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; diff --git a/macos/QMK Toolbox/Resources/avrdude b/macos/QMK Toolbox/Resources/avrdude deleted file mode 100755 index 66d17c1bee..0000000000 Binary files a/macos/QMK Toolbox/Resources/avrdude and /dev/null differ diff --git a/macos/QMK Toolbox/Resources/bootloadHID b/macos/QMK Toolbox/Resources/bootloadHID deleted file mode 100755 index fc2e3e24bc..0000000000 Binary files a/macos/QMK Toolbox/Resources/bootloadHID and /dev/null differ diff --git a/macos/QMK Toolbox/Resources/dfu-programmer b/macos/QMK Toolbox/Resources/dfu-programmer deleted file mode 100755 index ba8dd31803..0000000000 Binary files a/macos/QMK Toolbox/Resources/dfu-programmer and /dev/null differ diff --git a/macos/QMK Toolbox/Resources/dfu-util b/macos/QMK Toolbox/Resources/dfu-util deleted file mode 100755 index 69d5c59628..0000000000 Binary files a/macos/QMK Toolbox/Resources/dfu-util and /dev/null differ diff --git a/macos/QMK Toolbox/Resources/hid_bootloader_cli b/macos/QMK Toolbox/Resources/hid_bootloader_cli deleted file mode 100755 index 89ac3ea586..0000000000 Binary files a/macos/QMK Toolbox/Resources/hid_bootloader_cli and /dev/null differ diff --git a/macos/QMK Toolbox/Resources/libavrdude.1.0.0.dylib b/macos/QMK Toolbox/Resources/libavrdude.1.0.0.dylib deleted file mode 100644 index 80c02d9600..0000000000 Binary files a/macos/QMK Toolbox/Resources/libavrdude.1.0.0.dylib and /dev/null differ diff --git a/macos/QMK Toolbox/Resources/libftdi1.2.5.0.dylib b/macos/QMK Toolbox/Resources/libftdi1.2.5.0.dylib deleted file mode 100644 index 92d2c88e1c..0000000000 Binary files a/macos/QMK Toolbox/Resources/libftdi1.2.5.0.dylib and /dev/null differ diff --git a/macos/QMK Toolbox/Resources/libhidapi.0.14.0.dylib b/macos/QMK Toolbox/Resources/libhidapi.0.14.0.dylib deleted file mode 100644 index 07d8d0cfe3..0000000000 Binary files a/macos/QMK Toolbox/Resources/libhidapi.0.14.0.dylib and /dev/null differ diff --git a/macos/QMK Toolbox/Resources/libusb-0.1.4.dylib b/macos/QMK Toolbox/Resources/libusb-0.1.4.dylib deleted file mode 100644 index 19ef307b03..0000000000 Binary files a/macos/QMK Toolbox/Resources/libusb-0.1.4.dylib and /dev/null differ diff --git a/macos/QMK Toolbox/Resources/libusb-1.0.0.dylib b/macos/QMK Toolbox/Resources/libusb-1.0.0.dylib deleted file mode 100644 index 6f84f577d9..0000000000 Binary files a/macos/QMK Toolbox/Resources/libusb-1.0.0.dylib and /dev/null differ diff --git a/macos/QMK Toolbox/Resources/mdloader b/macos/QMK Toolbox/Resources/mdloader deleted file mode 100755 index 60fe4cabd6..0000000000 Binary files a/macos/QMK Toolbox/Resources/mdloader and /dev/null differ diff --git a/macos/QMK Toolbox/Resources/teensy_loader_cli b/macos/QMK Toolbox/Resources/teensy_loader_cli deleted file mode 100755 index 3545c88e5a..0000000000 Binary files a/macos/QMK Toolbox/Resources/teensy_loader_cli and /dev/null differ diff --git a/macos/QMK Toolbox/Resources/wb32-dfu-updater_cli b/macos/QMK Toolbox/Resources/wb32-dfu-updater_cli deleted file mode 100755 index 77053fd390..0000000000 Binary files a/macos/QMK Toolbox/Resources/wb32-dfu-updater_cli and /dev/null differ diff --git a/macos/QMK Toolbox/USB/Bootloader/BootloaderDevice.swift b/macos/QMK Toolbox/USB/Bootloader/BootloaderDevice.swift index 903db6123e..890da1f433 100644 --- a/macos/QMK Toolbox/USB/Bootloader/BootloaderDevice.swift +++ b/macos/QMK Toolbox/USB/Bootloader/BootloaderDevice.swift @@ -52,12 +52,26 @@ class BootloaderDevice: USBDeviceProtocol, CustomStringConvertible { func reset(_ mcu: String) {} + func resolveHomebrewBinary(for command: String) -> URL? { + let fileManager = FileManager() + if fileManager.fileExists(atPath: "/opt/homebrew/bin/\(command)") { + return URL(fileURLWithPath: "/opt/homebrew/bin/\(command)") + } else if fileManager.fileExists(atPath: "/usr/local/bin/\(command)") { + return URL(fileURLWithPath: "/usr/local/bin/\(command)") + } + return nil + } + func runProcess(_ command: String, args: [String]) { print(message: "\(command) \(args.joined(separator: " "))", type: .command) + guard let resolvedCommand = resolveHomebrewBinary(for: command) else { + print(message: "\(command) does not seem to be installed!", type: .error) + return + } + let task = Process() - task.executableURL = Bundle.main.url(forResource: command, withExtension: nil) - task.currentDirectoryURL = Bundle.main.resourceURL + task.executableURL = resolvedCommand task.arguments = args let outPipe = Pipe()