Skip to content

Commit 43e055b

Browse files
committed
feat: update build configuration for macOS to support Intel architecture and add additional library paths
1 parent cd82f98 commit 43e055b

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222
target: linux-arm64
2323
- os: macos-latest
2424
target: darwin-arm64
25+
- os: macos-15-intel
26+
target: darwin-x64
2527
- os: windows-latest
2628
target: win32-x64
2729

@@ -44,7 +46,7 @@ jobs:
4446
sudo apt-get install -y libusb-1.0-0 libindi1 || true
4547
4648
- name: Install system dependencies (macOS)
47-
if: matrix.os == 'macos-latest'
49+
if: startsWith(matrix.os, 'macos')
4850
run: |
4951
brew install autoconf automake libtool dylibbundler
5052
pip3 install setuptools --break-system-packages || true
@@ -221,7 +223,7 @@ jobs:
221223
222224
Includes precompiled binaries for:
223225
- Linux x64/ARM64
224-
- macOS ARM64 (Apple Silicon)
226+
- macOS ARM64 (Apple Silicon) & x64 (Intel)
225227
- Windows x64
226228
227229
### Installation
@@ -245,5 +247,6 @@ jobs:
245247
prebuilds-linux-x64
246248
prebuilds-linux-arm64
247249
prebuilds-darwin-arm64
250+
prebuilds-darwin-x64
248251
prebuilds-win32-x64
249252
failOnError: false

binding.gyp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,20 @@
4242
"include_dirs": [
4343
"<!@(node -e \"if(process.env.HAMLIB_PREFIX) console.log(process.env.HAMLIB_PREFIX + '/include')\")",
4444
"/usr/local/include",
45-
"/opt/homebrew/include"
45+
"/usr/local/opt/hamlib/include",
46+
"/usr/local/opt/libusb/include",
47+
"/opt/homebrew/include",
48+
"/opt/homebrew/opt/hamlib/include",
49+
"/opt/homebrew/opt/libusb/include"
4650
],
4751
"libraries": [
4852
"<!@(node -e \"if(process.env.HAMLIB_PREFIX) console.log('-L' + process.env.HAMLIB_PREFIX + '/lib')\")",
4953
"-L/usr/local/lib",
54+
"-L/usr/local/opt/hamlib/lib",
55+
"-L/usr/local/opt/libusb/lib",
5056
"-L/opt/homebrew/lib",
57+
"-L/opt/homebrew/opt/hamlib/lib",
58+
"-L/opt/homebrew/opt/libusb/lib",
5159
"-lhamlib"
5260
],
5361
"xcode_settings": {

scripts/verify.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ function verifyBinary(prebuild) {
236236
* Verify all platforms (CI mode)
237237
*/
238238
function verifyAll(prebuildsDir) {
239-
const expectedPlatforms = ['linux-x64', 'linux-arm64', 'darwin-arm64', 'win32-x64'];
239+
const expectedPlatforms = ['linux-x64', 'linux-arm64', 'darwin-arm64', 'darwin-x64', 'win32-x64'];
240240

241241
logger.step('Checking platform directories', 1, 2);
242242

0 commit comments

Comments
 (0)