Browse Source

A few corrections detected from CI builds

Signed-off-by: falkTX <falktx@falktx.com>
master
falkTX 3 months ago
parent
commit
0735e7bab9
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 8 additions and 8 deletions
  1. +1
    -1
      .github/workflows/build.yml
  2. +1
    -1
      .github/workflows/irc.yml
  3. +6
    -6
      meson.build

+ 1
- 1
.github/workflows/build.yml View File

@@ -107,7 +107,7 @@ jobs:
echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
sudo apt-get update -qq
sudo apt-get install -yqq build-essential meson
sudo apt-get install -yqq +-arm-linux-gnueabihf libasound2-dev:armhf libfftw3-dev:armhf libfreetype6-dev:armhf libgl1-mesa-dev:armhf libx11-dev:armhf libxcomposite-dev:armhf libxcursor-dev:armhf libxrender-dev:armhf qemu-user-static
sudo apt-get install -yqq g++-arm-linux-gnueabihf libasound2-dev:armhf libfftw3-dev:armhf libfreetype6-dev:armhf libgl1-mesa-dev:armhf libx11-dev:armhf libxcomposite-dev:armhf libxcursor-dev:armhf libxrender-dev:armhf qemu-user-static
- name: Build linux armhf cross-compiled
env:
AR: arm-linux-gnueabihf-ar


+ 1
- 1
.github/workflows/irc.yml View File

@@ -15,6 +15,6 @@ jobs:
- name: IRC notification
uses: Gottox/irc-message-action@v2
with:
channel: '#cardinal'
channel: '#kxstudio'
nickname: github-event-bot
message: ${{ steps.message.outputs.message }}

+ 6
- 6
meson.build View File

@@ -17,14 +17,14 @@ if libdir.contains('/')
libdir = 'lib'
endif

linux_embed = get_option('linux-embed')
build_lv2 = get_option('build-lv2')
build_vst2 = get_option('build-vst2')
build_vst3 = get_option('build-vst3')
build_vst2 = get_option('build-vst2') and not linux_embed
build_vst3 = get_option('build-vst3') and not linux_embed
build_juce5_only = get_option('build-juce5-only')
build_juce6_only = get_option('build-juce6-only')
build_juce7_only = get_option('build-juce7-only')
build_universal = get_option('build-universal')
linux_embed = get_option('linux-embed')
optimizations = get_option('optimizations') and buildtype != 'debug'

###############################################################################
@@ -189,7 +189,7 @@ if optimizations
'-fprefetch-loop-arrays',
]
endif
if host_machine.cpu_family().contains('x86') or build_universal
if build_machine.cpu_family().contains('x86') or build_universal
build_flags_release += [
'-mtune=generic', '-msse', '-msse2',
]
@@ -212,7 +212,7 @@ if os_darwin
build_flags_cpp += [
'-ObjC++',
]
if universal
if build_universal
build_flags += [
'-arch', 'x86_64',
'-arch', 'arm64',
@@ -262,7 +262,7 @@ if optimizations
endif

if os_darwin
if universal
if build_universal
link_flags += [
'-arch', 'x86_64',
'-arch', 'arm64',


Loading…
Cancel
Save