Browse Source

Fix OSX build

tags/1.9.7
falkTX 9 years ago
parent
commit
e9a1cc754a
4 changed files with 5 additions and 5 deletions
  1. +2
    -2
      data/macos/build.sh
  2. +1
    -1
      source/modules/dgl/src/Window.cpp
  3. +1
    -1
      source/modules/distrho/DistrhoUtils.hpp
  4. +1
    -1
      source/utils/CarlaMathUtils.hpp

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

@@ -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 PKG_CONFIG_PATH=$TARGETDIR/carla/lib/pkgconfig:$TARGETDIR/carla64/lib/pkgconfig

make HAVE_DGL=false $JOBS
make $JOBS

##############################################################################################
# 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 PKG_CONFIG_PATH=$TARGETDIR/carla32/lib/pkgconfig

make HAVE_DGL=false posix32 $JOBS
make posix32 $JOBS

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


+ 1
- 1
source/modules/dgl/src/Window.cpp View File

@@ -17,7 +17,7 @@
// we need this for now
//#define PUGL_GRAB_FOCUS 1

#include "../../distrho/src/DistrhoDefines.h"
#include "../Base.hpp"

#undef PUGL_HAVE_CAIRO
#undef PUGL_HAVE_GL


+ 1
- 1
source/modules/distrho/DistrhoUtils.hpp View File

@@ -33,7 +33,7 @@
# include <stdint.h>
#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 {
inline float fmin(float __x, float __y)
{ return __builtin_fminf(__x, __y); }


+ 1
- 1
source/utils/CarlaMathUtils.hpp View File

@@ -203,7 +203,7 @@ void carla_zeroFloats(float floats[], const std::size_t count) noexcept
// --------------------------------------------------------------------------------------------------------------------
// 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 {
inline float fmin(float __x, float __y)
{ return __builtin_fminf(__x, __y); }


Loading…
Cancel
Save