[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14132] trunk/blender: fixes for bugs #8496 & #8497

[JLuc Peuriere]

Revision: 14132
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14132
Author:   lukep
Date:     2008-03-16 09:08:28 +0100 (Sun, 16 Mar 2008)

Log Message:
-----------
fixes for bugs #8496 & #8497 

large sources defines cannot be used on darwin 
and windows 

Modified Paths:
--------------
    trunk/blender/extern/ffmpeg/SConscript
    trunk/blender/source/blender/blenlib/intern/BLI_storage.h

Modified: trunk/blender/extern/ffmpeg/SConscript
===================================================================
--- trunk/blender/extern/ffmpeg/SConscript	2008-03-16 06:28:40 UTC (rev 14131)
+++ trunk/blender/extern/ffmpeg/SConscript	2008-03-16 08:08:28 UTC (rev 14132)
@@ -123,7 +123,11 @@
     sources = list(Set(objs.split()))
     sources = [lib + "/" + x for x in sources]
 
-    defs = "HAVE_AV_CONFIG_H _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _ISOC9X_SOURCE"
+    if env['OURPLATFORM'] in ['win32-mingw', 'win32-vc' , 'darwin'] :
+    	defs = "HAVE_AV_CONFIG_H  _ISOC9X_SOURCE"
+    	print "passing switch"
+    else :
+		defs = "HAVE_AV_CONFIG_H _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _ISOC9X_SOURCE"
     cflags = ""
     
     if "CFLAGS" in vars:

Modified: trunk/blender/source/blender/blenlib/intern/BLI_storage.h
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_storage.h	2008-03-16 06:28:40 UTC (rev 14131)
+++ trunk/blender/source/blender/blenlib/intern/BLI_storage.h	2008-03-16 08:08:28 UTC (rev 14132)
@@ -31,10 +31,12 @@
 #ifndef BLI_STORAGE_H
 #define BLI_STORAGE_H
 
+#ifndef __APPLE__
 #ifndef WIN32
 #define _LARGEFILE_SOURCE 1
 #define _FILE_OFFSET_BITS 64
 #endif
+#endif
 
 #include "BLI_storage_types.h"