[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30492] trunk/blender: - Reverted " Set FREE_WINDOWS when compiling with MinGW"

[Sergey Sharybin]

Revision: 30492
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30492
Author:   nazgul
Date:     2010-07-19 11:19:54 +0200 (Mon, 19 Jul 2010)

Log Message:
-----------
- 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

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/linuxcross-config.py
    trunk/blender/build_files/scons/config/win32-mingw-config.py
    trunk/blender/source/blender/blenlib/SConscript
    trunk/blender/source/blender/blenlib/intern/storage.c

Modified: trunk/blender/build_files/scons/config/linuxcross-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linuxcross-config.py	2010-07-19 09:04:22 UTC (rev 30491)
+++ trunk/blender/build_files/scons/config/linuxcross-config.py	2010-07-19 09:19:54 UTC (rev 30492)
@@ -182,7 +182,7 @@
 
 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']

Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py	2010-07-19 09:04:22 UTC (rev 30491)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py	2010-07-19 09:19:54 UTC (rev 30492)
@@ -173,7 +173,7 @@
 
 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']

Modified: trunk/blender/source/blender/blenlib/SConscript
===================================================================
--- trunk/blender/source/blender/blenlib/SConscript	2010-07-19 09:04:22 UTC (rev 30491)
+++ trunk/blender/source/blender/blenlib/SConscript	2010-07-19 09:19:54 UTC (rev 30492)
@@ -7,7 +7,7 @@
 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'] 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['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 )

Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/storage.c	2010-07-19 09:04:22 UTC (rev 30491)
+++ trunk/blender/source/blender/blenlib/intern/storage.c	2010-07-19 09:19:54 UTC (rev 30492)
@@ -437,7 +437,7 @@
 
 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 @@
 	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;