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 +- source/blender/editors/space_file/fsmenu.c | 12 +++++------- source/blender/render/intern/raytrace/reorganize.h | 1 + 5 files changed, 9 insertions(+), 10 deletions(-) (limited to 'source/blender') 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 diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index 8211257da02..a043fc8cfd1 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -280,13 +280,10 @@ void fsmenu_read_bookmarks(struct FSMenu* fsmenu, const char *filename) void fsmenu_read_system(struct FSMenu* fsmenu) { char line[256]; - FILE *fp; - #ifdef WIN32 /* Add the drive names to the listing */ { __int64 tmp; - char folder[256]; char tmps[4]; int i; @@ -304,10 +301,10 @@ void fsmenu_read_system(struct FSMenu* fsmenu) } /* Adding Desktop and My Documents */ - SHGetSpecialFolderPath(0, folder, CSIDL_PERSONAL, 0); - fsmenu_insert_entry(fsmenu,FS_CATEGORY_BOOKMARKS, folder, 1, 0); - SHGetSpecialFolderPath(0, folder, CSIDL_DESKTOPDIRECTORY, 0); - fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, folder, 1, 0); + SHGetSpecialFolderPath(0, line, CSIDL_PERSONAL, 0); + fsmenu_insert_entry(fsmenu,FS_CATEGORY_BOOKMARKS, line, 1, 0); + SHGetSpecialFolderPath(0, line, CSIDL_DESKTOPDIRECTORY, 0); + fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, line, 1, 0); } #else #ifdef __APPLE__ @@ -474,6 +471,7 @@ void fsmenu_read_system(struct FSMenu* fsmenu) /* loop over mount points */ struct mntent *mnt; int len; + FILE *fp; fp = setmntent (MOUNTED, "r"); if (fp == NULL) { diff --git a/source/blender/render/intern/raytrace/reorganize.h b/source/blender/render/intern/raytrace/reorganize.h index 7ef7296945c..1d923c92d6f 100644 --- a/source/blender/render/intern/raytrace/reorganize.h +++ b/source/blender/render/intern/raytrace/reorganize.h @@ -35,6 +35,7 @@ #include "BKE_global.h" #ifdef _WIN32 +#undef INFINITY #define INFINITY FLT_MAX // in mingw math.h: (1.0F/0.0F). This generates compile error, though. #endif -- cgit v1.2.3