mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-07-12 14:25:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Check MacOS architecture and add Intel MacOS build target

Browse Source
This commit is contained in:
Adam Honse
2021-03-13 14:50:59 -06:00
parent 288a1deb91
commit bac68ee861
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.gitlab-ci.yml
View File

@@ -251,7 +251,7 @@ build_windows_64:
#-----------------------------------------------------------------------#
# MacOS Build Target #
#-----------------------------------------------------------------------#
build_macos:
build_macos_arm64:
tags:
- macos
stage: build
@@ -271,3 +271,24 @@ build_macos:
when: on_success
- if: '$BUILD_MACOS =~ /.+/'
when: on_success
build_macos_intel:
tags:
- macos
stage: build
script:
- eval $(/usr/local/bin/brew shellenv)
- /usr/local/bin/qmake OpenRGB.pro
- make -j16
- macdeployqt OpenRGB.app -codesign=OpenRGB
artifacts:
paths:
- OpenRGB.app
expire_in: 30 days
rules:
- if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
when: on_success
- if: '$BUILD_MACOS =~ /.+/'
when: on_success

27
OpenRGB.pro
View File

@@ -820,7 +820,28 @@ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15
macx:ICON = qt/OpenRGB.icns
unix:macx {
macx:contains(QMAKE_HOST.arch, arm64) {
DEFINES += \
USE_HID_USAGE \
SOURCES += \
serial_port/find_usb_serial_port_linux.cpp \
INCLUDEPATH += \
# /usr/local/include \
/opt/homebrew/include \
LIBS += \
# -L/usr/local/lib \
-L/opt/homebrew/lib \
-lusb-1.0 \
-lhidapi \
CONFIG += \
c++14 \
}
macx:contains(QMAKE_HOST.arch, x86_64) {
DEFINES += \
USE_HID_USAGE \
@@ -829,11 +850,11 @@ unix:macx {
INCLUDEPATH += \
/usr/local/include \
/opt/homebrew/include \
# /opt/homebrew/include \
LIBS += \
-L/usr/local/lib \
-L/opt/homebrew/lib \
# -L/opt/homebrew/lib \
-lusb-1.0 \
-lhidapi \