[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19938] trunk/blender/source: [#18616] Scons+MinGW compiling error with gaming engine enabled.
Campbell Barton
ideasman42 at gmail.com
Mon Apr 27 09:07:22 CEST 2009
Revision: 19938
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19938
Author: campbellbarton
Date: 2009-04-27 09:07:22 +0200 (Mon, 27 Apr 2009)
Log Message:
-----------
[#18616] Scons+MinGW compiling error with gaming engine enabled.
Attempt to fix building in windows with mingw
Modified Paths:
--------------
trunk/blender/source/creator/creator.c
trunk/blender/source/gameengine/Expressions/InputParser.cpp
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2009-04-27 05:06:24 UTC (rev 19937)
+++ trunk/blender/source/creator/creator.c 2009-04-27 07:07:22 UTC (rev 19938)
@@ -538,10 +538,10 @@
BLI_where_is_temp( btempdir, 1 ); /* call after loading the .B.blend so we can read U.tempdir */
#ifndef DISABLE_SDL
-#ifndef WIN32
+#if (defined(WIN32) || defined(WIN64)) && !defined(FREE_WINDOWS)
+ _putenv_s("SDL_VIDEODRIVER", "dummy");
+#else
setenv("SDL_VIDEODRIVER", "dummy", 1); /* initializing the video driver can cause crashes on some systems - Campbell */
-#else
- _putenv_s("SDL_VIDEODRIVER", "dummy");
#endif
#ifdef __linux__
/* On linux the default SDL driver dma often would not play
Modified: trunk/blender/source/gameengine/Expressions/InputParser.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/InputParser.cpp 2009-04-27 05:06:24 UTC (rev 19937)
+++ trunk/blender/source/gameengine/Expressions/InputParser.cpp 2009-04-27 07:07:22 UTC (rev 19938)
@@ -38,7 +38,7 @@
// cool things like (IF(LOD==1,CCurvedValue,IF(LOD==2,CCurvedValue2)) etc...
#include "IfExpr.h"
-#if defined(WIN32) || defined(WIN64)
+#if (defined(WIN32) || defined(WIN64)) && !defined(FREE_WINDOWS)
#define strcasecmp _stricmp
#ifndef strtoll
More information about the Bf-blender-cvs
mailing list