| @@ -30,7 +30,7 @@ export LDFLAGS="-m64" | |||||
| export PATH=$TARGETDIR/carla/bin:$TARGETDIR/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin | 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 | export PKG_CONFIG_PATH=$TARGETDIR/carla/lib/pkgconfig:$TARGETDIR/carla64/lib/pkgconfig | ||||
| make HAVE_DGL=false $JOBS | |||||
| make $JOBS | |||||
| ############################################################################################## | ############################################################################################## | ||||
| # Build 32bit bridges | # Build 32bit bridges | ||||
| @@ -42,7 +42,7 @@ export LDFLAGS="-m32" | |||||
| export PATH=$TARGETDIR/carla32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin | export PATH=$TARGETDIR/carla32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin | ||||
| export PKG_CONFIG_PATH=$TARGETDIR/carla32/lib/pkgconfig | export PKG_CONFIG_PATH=$TARGETDIR/carla32/lib/pkgconfig | ||||
| make HAVE_DGL=false posix32 $JOBS | |||||
| make posix32 $JOBS | |||||
| ############################################################################################## | ############################################################################################## | ||||
| # Build Mac App | # Build Mac App | ||||
| @@ -17,7 +17,7 @@ | |||||
| // we need this for now | // we need this for now | ||||
| //#define PUGL_GRAB_FOCUS 1 | //#define PUGL_GRAB_FOCUS 1 | ||||
| #include "../../distrho/src/DistrhoDefines.h" | |||||
| #include "../Base.hpp" | |||||
| #undef PUGL_HAVE_CAIRO | #undef PUGL_HAVE_CAIRO | ||||
| #undef PUGL_HAVE_GL | #undef PUGL_HAVE_GL | ||||
| @@ -33,7 +33,7 @@ | |||||
| # include <stdint.h> | # include <stdint.h> | ||||
| #endif | #endif | ||||
| #if defined(DISTRHO_OS_MAC) && ! defined(CARLA_OS_MAC) && ! defined(DISTRHO_PROPER_CPP11_SUPPORT) | |||||
| #if defined(DISTRHO_OS_MAC) && ! defined(CARLA_OS_MAC) && ! defined(__clang__) | |||||
| namespace std { | namespace std { | ||||
| inline float fmin(float __x, float __y) | inline float fmin(float __x, float __y) | ||||
| { return __builtin_fminf(__x, __y); } | { return __builtin_fminf(__x, __y); } | ||||
| @@ -203,7 +203,7 @@ void carla_zeroFloats(float floats[], const std::size_t count) noexcept | |||||
| // -------------------------------------------------------------------------------------------------------------------- | // -------------------------------------------------------------------------------------------------------------------- | ||||
| // Missing functions in old OSX versions. | // Missing functions in old OSX versions. | ||||
| #if defined(CARLA_OS_MAC) && ! defined(DISTRHO_OS_MAC) && ! defined(CARLA_PROPER_CPP11_SUPPORT) | |||||
| #if defined(CARLA_OS_MAC) && ! defined(DISTRHO_OS_MAC) && ! defined(__clang__) | |||||
| namespace std { | namespace std { | ||||
| inline float fmin(float __x, float __y) | inline float fmin(float __x, float __y) | ||||
| { return __builtin_fminf(__x, __y); } | { return __builtin_fminf(__x, __y); } | ||||