From 1f8f55b3cd268eb2124ace50b455586a329c2b89 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 19 Jul 2010 09:19:54 +0000 Subject: [PATCH] - Reverted "Set FREE_WINDOWS when compiling with MinGW" - Reverted own changes made to _stat function BLI_exists - Use __MINGW32__ instead of FREE_WINDOWS in BLI_exists - Removed recently added lib dependencies for mingw --- build_files/scons/config/linuxcross-config.py | 2 +- build_files/scons/config/win32-mingw-config.py | 2 +- source/blender/blenlib/SConscript | 7 ++----- source/blender/blenlib/intern/storage.c | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build_files/scons/config/linuxcross-config.py b/build_files/scons/config/linuxcross-config.py index 6ec429ef2f8..1650201f8c6 100644 --- a/build_files/scons/config/linuxcross-config.py +++ b/build_files/scons/config/linuxcross-config.py @@ -182,7 +182,7 @@ C_WARN = [ '-Wall' , '-Wno-char-subscripts', '-Wdeclaration-after-statement' ] CC_WARN = [ '-Wall' ] -LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++', '-luuid', '-lole32', '-lmsvcr90'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ] +LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++', '-luuid', '-lole32'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ] BF_DEBUG = False BF_DEBUG_CCFLAGS = ['-g'] diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py index b9e6ba358a1..f8b67781172 100644 --- a/build_files/scons/config/win32-mingw-config.py +++ b/build_files/scons/config/win32-mingw-config.py @@ -173,7 +173,7 @@ C_WARN = [ '-Wno-char-subscripts', '-Wdeclaration-after-statement' ] CC_WARN = [ '-Wall' ] -LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid', '-lmsvcr90'] +LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid'] BF_DEBUG = False BF_DEBUG_CCFLAGS= ['-g'] diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 37dc8bbe012..78aecf9936b 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -7,7 +7,7 @@ cflags='' incs = '. ../makesdna ../blenkernel #/intern/guardedalloc #/intern/ghost ../editors/include ../gpu' incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_ZLIB_INC'] -defs = [] +defs = '' if env['OURPLATFORM'] == 'linux2': cflags='-pthread' @@ -16,9 +16,6 @@ if env['OURPLATFORM'] == 'linux2': if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] -if env['OURPLATFORM'] == 'win32-mingw': - defs.append('FREE_WINDOWS') - if env['OURPLATFORM'] == 'linuxcross': if env['WITH_BF_OPENMP']: incs += ' ' + env['BF_OPENMP_INC'] @@ -27,4 +24,4 @@ if env['OURPLATFORM'] == 'darwin': if env['WITH_BF_OPENMP']: env.Append(CFLAGS=['-DPARALLEL=1']) -env.BlenderLib ( 'bf_blenlib', sources, Split(incs), defs, libtype=['core','player'], priority = [363,170], compileflags =cflags ) +env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [363,170], compileflags =cflags ) diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 5bf6acf3847..b7e2aeb84c8 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -437,7 +437,7 @@ int BLI_filepathsize(const char *path) int BLI_exist(char *name) { -#if defined(WIN32) && !defined(FREE_WINDOWS) +#if defined(WIN32) && !defined(__MINGW32__) struct _stat64i32 st; /* in Windows stat doesn't recognize dir ending on a slash To not break code where the ending slash is expected we @@ -447,7 +447,7 @@ int BLI_exist(char *name) BLI_strncpy(tmp, name, FILE_MAXDIR+FILE_MAXFILE); len = strlen(tmp); if (len > 3 && ( tmp[len-1]=='\\' || tmp[len-1]=='/') ) tmp[len-1] = '\0'; - res = _stat64i32(tmp, &st); + res = _stat(tmp, &st); if (res == -1) return(0); #else struct stat st;