Browse Source

Fix universal cmake builds, test universal plugins in x64 mode too

tags/v1.0
falkTX 4 years ago
parent
commit
48663c82ad
2 changed files with 6 additions and 1 deletions
  1. +5
    -0
      build-plugins.sh
  2. +1
    -1
      setup/functions.sh

+ 5
- 0
build-plugins.sh View File

@@ -76,6 +76,11 @@ function validate_lv2_plugin() {


env LANG=C LV2_PATH="${LV2DIR}" WINEDEBUG=-all ${carlaenv} \ env LANG=C LV2_PATH="${LV2DIR}" WINEDEBUG=-all ${carlaenv} \
"${PAWPAW_PREFIX}/bin/carla-single" lv2 "${lv2plugin}" 1>/dev/null "${PAWPAW_PREFIX}/bin/carla-single" lv2 "${lv2plugin}" 1>/dev/null

if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
env LANG=C LV2_PATH="${LV2DIR}" ${carlaenv} \
arch -arch x86_64 "${PAWPAW_PREFIX}/bin/carla-single" lv2 "${lv2plugin}" 1>/dev/null
fi
} }


# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


+ 1
- 1
setup/functions.sh View File

@@ -263,7 +263,7 @@ function build_cmake() {
OSX_ARCHS="i686" OSX_ARCHS="i686"
OSX_TARGET="10.5" OSX_TARGET="10.5"
elif [ "${MACOS_UNIVERSAL}" -eq 1 ]; then elif [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
OSX_ARCHS="arm64,x86_64"
OSX_ARCHS="arm64;x86_64"
OSX_TARGET="10.12" OSX_TARGET="10.12"
else else
OSX_ARCHS="x86_64" OSX_ARCHS="x86_64"


Loading…
Cancel
Save