Compare commits

..

5 Commits

Author SHA1 Message Date
Dave Griffiths b965130cd9 Merge branch 'main' of gitlab.com:then-try-this/samplebrain into main 2022-09-25 22:02:00 +01:00
Dave Griffiths 79b1c1aeda new mac m1 version link 2022-09-25 21:57:38 +01:00
nik gaffney 395ff352e3 Merge branch 'main' into 'main'
added homebrew arm64 paths

See merge request then-try-this/samplebrain!3
2022-09-25 20:37:28 +00:00
nik gaffney dd92364be6 added homebrew arm64 paths 2022-09-25 22:30:39 +02:00
nik gaffney 493209c28d add .gitlab-ci.yml file 2022-09-25 08:58:05 +00:00
3 changed files with 52 additions and 5 deletions

46
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,46 @@
# This file is a template, and might need editing before it works on your project.
# This is a sample GitLab CI/CD configuration file that should run without any modifications.
# It demonstrates a basic 3 stage CI/CD pipeline. Instead of real tests or scripts,
# it uses echo commands to simulate the pipeline execution.
#
# A pipeline is composed of independent jobs that run scripts, grouped into stages.
# Stages run in sequential order, but jobs within stages run in parallel.
#
# For more information, see: https://docs.gitlab.com/ee/ci/yaml/index.html#stages
#
# You can copy and paste this template into a new `.gitlab-ci.yml` file.
# You should not add this template to an existing `.gitlab-ci.yml` file by using the `include:` keyword.
#
# To contribute improvements to CI/CD templates, please follow the Development guide at:
# https://docs.gitlab.com/ee/development/cicd/templates.html
# This specific template is located at:
# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml
# see also https://docs.gitlab.com/ee/ci/runners/saas/macos_saas_runner.html
.macos_saas_runners:
tags:
- shared-macos-amd64
image: macos-11-xcode-12
stages:
- build
- test
before_script:
- echo "started by ${GITLAB_USER_NAME}"
build:
extends:
- .macos_saas_runners
stage: build
script:
- echo "running scripts in the build job"
test:
extends:
- .macos_saas_runners
stage: test
script:
- echo "running scripts in the test job"

View File

@ -37,11 +37,13 @@ Full description of all the parameters and a bit of the thinking
behind it. behind it.
# Binaries # Binaries
* **Windows**: [samplebrain_0.18_win.zip](https://static.thentrythis.org/samplebrain/samplebrain_0.18_win.zip) * **Windows**: [samplebrain_0.18_win.zip](https://static.thentrythis.org/samplebrain/samplebrain_0.18_win.zip)
* **Mac (intel)**: [samplebrain_0.18_macintel.zip](https://static.thentrythis.org/samplebrain/samplebrain_0.18_macintel.zip) * **Mac (intel)**: [samplebrain_0.18_macintel.zip](https://static.thentrythis.org/samplebrain/samplebrain_0.18_macintel.zip)
* **Mac (m1)**: (if this doesn't work try the one above) [samplebrain_0.18_m1.dmg](https://static.thentrythis.org/samplebrain/samplebrain_0.18_m1.dmg) (thank you to [Nik Gaffney](http://fo.am) for building) * **Mac (m1 VERSION 2!)**: [samplebrain_0.18_m1_v2.dmg](https://static.thentrythis.org/samplebrain/samplebrain_0.18_m1_v2.dmg)
Thank you to [Nik Gaffney](http://fo.am) for help with the Apple builds.
Mac note: As this software is not on the apple store, to run the Mac note: As this software is not on the apple store, to run the
binary you need to tell your mac it's ok: Go to System Preferences > binary you need to tell your mac it's ok: Go to System Preferences >
Security & Privacy > General. At the bottom of the window, select Security & Privacy > General. At the bottom of the window, select

View File

@ -43,7 +43,8 @@ SOURCES += app/MainWindow.cpp \
INCLUDEPATH += brain/src INCLUDEPATH += brain/src
INCLUDEPATH += /usr/local/include INCLUDEPATH += /usr/local/include
LIBS += -L.. -L/usr/local/lib -lportaudio -lfftw3 -lsndfile -llo -ldl -lpthread -lm INCLUDEPATH += /opt/homebrew/include
LIBS += -L.. -L/usr/local/lib -L/opt/homebrew/lib -lportaudio -lfftw3 -lsndfile -llo -ldl -lpthread -lm
QMAKE_CXXFLAGS += -O3 -Wall -Wno-unused -std=c++11 QMAKE_CXXFLAGS += -O3 -Wall -Wno-unused -std=c++11
@ -57,5 +58,3 @@ unix:iconfile.files = desktop/samplebrain.svg
target.path = /usr/bin target.path = /usr/bin
INSTALLS += target desktopfile iconfile INSTALLS += target desktopfile iconfile