Skip to content

Commit

Permalink
Merge pull request #8 from exstrim401/fixmacos
Browse files Browse the repository at this point in the history
Fix macOS build
  • Loading branch information
nillerusr committed Nov 30, 2022
2 parents 47fc0e6 + 0fcf14d commit dfa42eb
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion havana/havok/hk_math/math.inl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ inline hk_real hk_Math::floor( hk_real r ) { return hk_real(::floor(r)); }
inline hk_real hk_Math::ceil( hk_real r) { return hk_real(::ceil(r)); }
inline hk_real hk_Math::pow( hk_real r, hk_real p) { return hk_real(::pow(r,p)); }

#elif _LINUX || __APPLE__ || BSD
#elif _LINUX || __APPLE__ || PLATFORM_BSD

namespace c_math
{
Expand Down
2 changes: 1 addition & 1 deletion ivp_intern/ivp_friction_gaps.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <ivp_friction_solver.hxx>
#include <ivp_debug_manager.hxx> // bvecause of debug psi_synchrone

#if !defined(WIN32) && !defined(PSXII) && !defined(GEKKO) && !defined(BSD)
#if !defined(WIN32) && !defined(PSXII) && !defined(GEKKO) && !defined(PLATFORM_BSD)
# include <alloca.h>
#endif

Expand Down
2 changes: 1 addition & 1 deletion ivp_intern/ivp_sim_unit.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <ivp_physics.hxx>

#if !defined(WIN32) && !defined(PSXII) && !defined(GEKKO) && !defined(BSD)
#if !defined(WIN32) && !defined(PSXII) && !defined(GEKKO) && !defined(PLATFORM_BSD)
# include <alloca.h>
#endif

Expand Down
2 changes: 1 addition & 1 deletion ivp_utility/ivu_float.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define IVP_EXP_FOR_ONE 0x7f
inline int PFM_LD(float a){ return ((p_float_ieee *)&(a))->ln.exp - IVP_EXP_FOR_ONE; };
#else
# if defined(LINUX) || defined(WIN32) || defined(OSX) || defined(BSD)
# if defined(LINUX) || defined(WIN32) || defined(OSX) || defined(PLATFORM_BSD)

union p_double_ieee {
IVP_DOUBLE val;
Expand Down

0 comments on commit dfa42eb

Please sign in to comment.