diff options
-rw-r--r-- | source/creator/creator.c | 6 | ||||
-rw-r--r-- | source/gameengine/Expressions/InputParser.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index 74e899d2d14..a1531fd7180 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -538,10 +538,10 @@ int main(int argc, char **argv) BLI_where_is_temp( btempdir, 1 ); /* call after loading the .B.blend so we can read U.tempdir */ #ifndef DISABLE_SDL -#ifndef WIN32 - setenv("SDL_VIDEODRIVER", "dummy", 1); /* initializing the video driver can cause crashes on some systems - Campbell */ -#else +#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 */ #endif #ifdef __linux__ /* On linux the default SDL driver dma often would not play diff --git a/source/gameengine/Expressions/InputParser.cpp b/source/gameengine/Expressions/InputParser.cpp index 66075dd8d42..834dff7af89 100644 --- a/source/gameengine/Expressions/InputParser.cpp +++ b/source/gameengine/Expressions/InputParser.cpp @@ -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 |