Skip to content

Commit

Permalink
Try and make build on OSX.
Browse files Browse the repository at this point in the history
  • Loading branch information
davidgiven committed Jan 7, 2024
1 parent f2d68f1 commit c994835
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
repository: 'davidgiven/fluxengine-testdata'
path: 'fluxengine-testdata'
- name: brew
run: brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg
run: brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg qt@5
- name: make
run: gmake -j`nproc` -C fluxengine

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: brew
run: brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg
run: brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg qt@5
- name: make
run: gmake

Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ endif
# Special OSX settings.

ifeq ($(shell uname),Darwin)
export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig"

LDFLAGS += \
-framework IOKit \
-framework Foundation
Expand Down

0 comments on commit c994835

Please sign in to comment.