[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12165] trunk/blender/extern/ffmpeg/ SConscript: == FFMPEG ==

[Peter Schlaile]

Revision: 12165
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12165
Author:   schlaile
Date:     2007-09-28 10:06:38 +0200 (Fri, 28 Sep 2007)

Log Message:
-----------
== FFMPEG ==

Fix by Ken Hughes, that disables Blender CFLAGS for ffmpeg
(hopefully increases the number of people, where the compile does not fail :)

Modified Paths:
--------------
    trunk/blender/extern/ffmpeg/SConscript

Modified: trunk/blender/extern/ffmpeg/SConscript
===================================================================
--- trunk/blender/extern/ffmpeg/SConscript	2007-09-27 23:42:21 UTC (rev 12164)
+++ trunk/blender/extern/ffmpeg/SConscript	2007-09-28 08:06:38 UTC (rev 12165)
@@ -12,6 +12,10 @@
 
 Import('env')
 
+ff_env = env.Copy();
+ff_env.Replace(CCFLAGS = '')
+ff_env.Replace(BF_DEBUG_FLAGS = '')
+
 makevardef = re.compile('^([a-zA-Z0-9_-]+)[ \t]*(\+?)=(.*)')
 makevarsubst = re.compile('\$\(([^\)]+)\)')
 makeifeq = re.compile('if(n?)eq \(([^,]*),([^\)]*)\)')
@@ -90,7 +94,6 @@
     os.mkdir(root + "/include");
 if not os.path.isdir(root + "/include/ffmpeg"):
     os.mkdir(root + "/include/ffmpeg");
-        
 
 for lib in all_libs:
     vars = getmakevars([root + '/config.mak', root + "/" + lib + '/Makefile'])
@@ -134,11 +137,9 @@
             shutil.copyfile(root + "/" + lib + "/" + h,
                             root + "/include/ffmpeg/" + h)
 
-    env.BlenderLib (libname="extern_" + lib, sources=sources,
+    ff_env.BlenderLib (libname="extern_" + lib, sources=sources,
                     includes=["."] + all_libs,
                     defines=Split(defs),
                     libtype=['core', 'intern', 'player'],
                     priority = [5, 5, 10],
                     compileflags = Split(cflags))
-        
-