Revision: 23465
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23465
Author: jesterking
Date: 2009-09-25 00:11:35 +0200 (Fri, 25 Sep 2009)
Log Message:
-----------
* some fixes to have scons/mingw compile the sources too, even with BF_DEBUG=1
and WITH_BF_GAMEENGINE=1
Modified Paths:
--------------
trunk/blender/intern/itasc/kdl/utilities/utility.h
trunk/blender/source/gameengine/Ketsji/SConscript
trunk/blender/source/gameengine/VideoTexture/SConscript
Modified: trunk/blender/intern/itasc/kdl/utilities/utility.h
===================================================================
--- trunk/blender/intern/itasc/kdl/utilities/utility.h 2009-09-24 21:37:07 UTC
(rev 23464)
+++ trunk/blender/intern/itasc/kdl/utilities/utility.h 2009-09-24 22:11:35 UTC
(rev 23465)
@@ -254,7 +254,8 @@
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
Modified: trunk/blender/source/gameengine/Ketsji/SConscript
===================================================================
--- trunk/blender/source/gameengine/Ketsji/SConscript 2009-09-24 21:37:07 UTC
(rev 23464)
+++ trunk/blender/source/gameengine/Ketsji/SConscript 2009-09-24 22:11:35 UTC
(rev 23465)
@@ -29,7 +29,7 @@
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
Modified: trunk/blender/source/gameengine/VideoTexture/SConscript
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/SConscript 2009-09-24
21:37:07 UTC (rev 23464)
+++ trunk/blender/source/gameengine/VideoTexture/SConscript 2009-09-24
22:11:35 UTC (rev 23465)
@@ -15,12 +15,11 @@
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')
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
