From 9b518710c678a48c829be6d2432eba427f733bdf Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 15 Sep 2010 16:13:32 +0000 Subject: update for MingW/CMake - ignore MSVC warnings when FREE_WINDOWS is defined to quiet warnings. - the CMake flags were not being set correctly making blender have weirdo colors (no -funsigned-char). --- source/blender/blenlib/intern/dynlib.c | 2 +- source/blender/blenlib/intern/fileops.c | 2 +- source/blender/blenlib/intern/winstuff.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/blenlib/intern') diff --git a/source/blender/blenlib/intern/dynlib.c b/source/blender/blenlib/intern/dynlib.c index f42b342e326..55d6ce7a241 100644 --- a/source/blender/blenlib/intern/dynlib.c +++ b/source/blender/blenlib/intern/dynlib.c @@ -87,7 +87,7 @@ char *PIL_dynlib_get_error_as_string(PILdynlib* lib) { return buf; } - return err; + return NULL; } void PIL_dynlib_close(PILdynlib *lib) { diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index fde770c238c..06b427240ba 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -41,12 +41,12 @@ #ifdef WIN32 #include #include "BLI_winstuff.h" +#include "BLI_callbacks.h" #else #include // for read close #include #endif - #include "BLI_blenlib.h" #include "BKE_utildefines.h" diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index 81a635205f9..b3438590321 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -33,7 +33,7 @@ #include #include - +#include "MEM_guardedalloc.h" #include "BLI_path_util.h" #include "BLI_string.h" #define WIN32_SKIP_HKEY_PROTECTION // need to use HKEY -- cgit v1.2.3