* some fixes to have scons/mingw compile the sources too, even with BF_DEBUG=1 and WITH_BF_GAMEENGINE=1

This commit is contained in:
Nathan Letwory
2009-09-24 22:11:35 +00:00
parent 1483fafd13
commit ee6cf88d4d
3 changed files with 4 additions and 4 deletions
+2 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -2
View File
@@ -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')