Browse Source

Fix build on macOS 10.8

tags/v2.1-rc1
Your Name 5 years ago
parent
commit
9cc1ab3f15
3 changed files with 10 additions and 3 deletions
  1. +7
    -2
      data/macos/build.sh
  2. +2
    -0
      source/backend/engine/CarlaEngineOscSend.cpp
  3. +1
    -1
      source/modules/water/water.h

+ 7
- 2
data/macos/build.sh View File

@@ -23,6 +23,9 @@ export MACOS="true"

if [ $(clang -v 2>&1 | grep version | cut -d' ' -f4 | cut -d'.' -f1) -lt 9 ]; then
export MACOS_OLD="true"
export USING_JUCE="false"
else
export USING_JUCE="true"
fi

export CC=clang
@@ -40,7 +43,7 @@ export LDFLAGS="-L${TARGETDIR}/carla64/lib -m64"
export PATH=${TARGETDIR}/carla/bin:${TARGETDIR}/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=${TARGETDIR}/carla/lib/pkgconfig:${TARGETDIR}/carla64/lib/pkgconfig

make USING_JUCE=true ${MAKE_ARGS}
make USING_JUCE=${USING_JUCE} ${MAKE_ARGS}

##############################################################################################
# Build 32bit bridges
@@ -53,7 +56,9 @@ export PATH=${TARGETDIR}/carla32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bi
export PKG_CONFIG_PATH=${TARGETDIR}/carla32/lib/pkgconfig

# FIXME install old xcode in new macos
# make USING_JUCE=true posix32 ${MAKE_ARGS}
if [ MACOS_OLD = "true" ]; then
make USING_JUCE=${USING_JUCE} posix32 ${MAKE_ARGS}
fi

##############################################################################################
# Build Mac App


+ 2
- 0
source/backend/engine/CarlaEngineOscSend.cpp View File

@@ -249,7 +249,9 @@ void CarlaEngineOsc::sendPluginInternalParameterValues(const CarlaPlugin* const
CARLA_SAFE_ASSERT_RETURN(plugin != nullptr,);
carla_debug("CarlaEngineOsc::sendPluginInternalParameterValues(%p)", plugin);

#ifdef CARLA_PROPER_CPP11_SUPPORT
static_assert(PARAMETER_ACTIVE == -2 && PARAMETER_MAX == -9, "Incorrect data");
#endif

double iparams[7];



+ 1
- 1
source/modules/water/water.h View File

@@ -40,7 +40,7 @@
#endif
#ifdef __clang__
#if __has_feature (cxx_rvalue_references)
#if __has_feature (cxx_implicit_moves) && __clang_major__ >= 9
#define WATER_COMPILER_SUPPORTS_MOVE_SEMANTICS 1
#endif


Loading…
Cancel
Save