salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge from master.

Browse Source
This commit is contained in:
David Given
2025-08-19 20:13:41 +02:00
parent da64c0237f bb3fbccb50
commit e105b7f498
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ccpp.yml vendored
View File

@@ -65,7 +65,7 @@ jobs:
run: | run: |
brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg
- name: make - name: make
run: gmake -C fluxengine -j2 run: gmake -C fluxengine
- name: Upload build artifacts - name: Upload build artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:

2
.github/workflows/release.yml vendored
View File

@@ -97,7 +97,7 @@ jobs:
- name: make - name: make
run: | run: |
gmake -j2 gmake
mv FluxEngine.pkg FluxEngine-${{ runner.arch }}.pkg mv FluxEngine.pkg FluxEngine-${{ runner.arch }}.pkg
- name: tag - name: tag

7
build/ab.mk
View File

@@ -87,7 +87,12 @@ $(PKG_CONFIG_HASHES) $(HOST_PKG_CONFIG_HASHES) &:
include $(OBJ)/build.mk include $(OBJ)/build.mk
MAKEFLAGS += -r -j$(shell nproc) ifeq ($(OSX),yes)
MAKEFLAGS += -r -j$(shell sysctl -n hw.logicalcpu)
else
MAKEFLAGS += -r -j$(shell nproc)
endif
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
.PHONY: update-ab .PHONY: update-ab