diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-09-25 02:11:35 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-09-25 02:11:35 +0400 |
| commit | ee6cf88d4d1571afd2a6922b09937efd9ab6b622 (patch) | |
| tree | b8f3b1dad5868c3b6c2082460e457efa9d094ecc | |
| parent | 1483fafd1372a3d3e025d08634e798adb7da512f (diff) | |
* some fixes to have scons/mingw compile the sources too, even with BF_DEBUG=1 and WITH_BF_GAMEENGINE=1
| -rw-r--r-- | intern/itasc/kdl/utilities/utility.h | 3 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/SConscript | 2 | ||||
| -rw-r--r-- | source/gameengine/VideoTexture/SConscript | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/itasc/kdl/utilities/utility.h b/intern/itasc/kdl/utilities/utility.h index e7dcc55d8a8..9c38eacbceb 100644 --- a/intern/itasc/kdl/utilities/utility.h +++ b/intern/itasc/kdl/utilities/utility.h @@ -254,7 +254,8 @@ inline double Norm(double arg) { return fabs( (double)arg ); } -#ifdef __WIN32__ + +#if defined(__WIN32__) && !defined(__GNUC__) inline double hypot(double y,double x) { return ::_hypot(y,x);} inline double abs(double x) { return ::fabs(x);} #endif diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 5f38020780b..b20da20d0e2 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -29,7 +29,7 @@ if env['WITH_BF_SDL']: else: defs.append('DISABLE_SDL') -if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): +if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'): if env['BF_DEBUG']: defs.append('_DEBUG') # for Python diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript index 119bd1c9954..dac0b6d32ab 100644 --- a/source/gameengine/VideoTexture/SConscript +++ b/source/gameengine/VideoTexture/SConscript @@ -15,12 +15,11 @@ incs += ' #source/blender/gpu #source/kernel/gen_system #intern/string #intern/m incs += ' #intern/guardedalloc #extern/glew/include' defs = [] -if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): +if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw'): if env['BF_DEBUG']: defs.append('_DEBUG') incs += ' ' + env['BF_PYTHON_INC'] -#incs += ' ' + env['BF_OPENGL_INC'] if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') |