view3d bg image now updates on frame change, and the panel for it properly draws...
[blender.git] / SConstruct
index cb90c2eaf663094681d006430103327c4335b6e7..83570cb5c1a28b070c471ee8940ce56c97419a07 100644 (file)
@@ -124,7 +124,10 @@ if toolset:
                #if env:
                #       btools.SetupSpawn(env)
 else:
-       env = BlenderEnvironment(ENV = os.environ)
+       if bitness==64 and platform=='win32':
+               env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+       else:
+               env = BlenderEnvironment(ENV = os.environ)
 
 if not env:
        print "Could not create a build environment"
@@ -221,6 +224,11 @@ if env['WITH_GHOST_COCOA'] == True:
        env.Append(CFLAGS=['-DGHOST_COCOA']) 
        env.Append(CXXFLAGS=['-DGHOST_COCOA'])
        env.Append(CPPFLAGS=['-DGHOST_COCOA'])
+    
+if env['USE_QTKIT'] == True:
+       env.Append(CFLAGS=['-DUSE_QTKIT']) 
+       env.Append(CXXFLAGS=['-DUSE_QTKIT'])
+       env.Append(CPPFLAGS=['-DUSE_QTKIT'])
 
 #check for additional debug libnames
 
@@ -370,7 +378,7 @@ if not os.path.isdir ( B.root_build_dir):
        os.makedirs ( B.root_build_dir + 'extern' )
        os.makedirs ( B.root_build_dir + 'lib' )
        os.makedirs ( B.root_build_dir + 'bin' )
-if not os.path.isdir(B.doc_build_dir):
+if not os.path.isdir(B.doc_build_dir) and env['WITH_BF_DOCS']:
        os.makedirs ( B.doc_build_dir )
 
 Help(opts.GenerateHelpText(env))
@@ -525,9 +533,10 @@ plugtargetlist = []
 for tp, tn, tf in os.walk('release/plugins'):
        if '.svn' in tn:
                tn.remove('.svn')
+       df = tp[8:] # remove 'release/'
        for f in tf:
                pluglist.append(os.path.join(tp, f))
-               plugtargetlist.append( os.path.join(*([BLENDERPATH] + tp.split(os.sep)[1:] + [f])) )
+               plugtargetlist.append( os.path.join(BLENDERPATH, df, f) )
 
 
 # header files for plugins
@@ -602,7 +611,11 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'):
                                                '${LCGDIR}/ffmpeg/lib/avformat-52.dll',
                                                '${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
                                                '${LCGDIR}/ffmpeg/lib/avutil-50.dll',
-                                               '${LCGDIR}/ffmpeg/lib/swscale-0.dll']
+                                               '${LCGDIR}/ffmpeg/lib/swscale-0.dll',
+                                               '${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
+                                               '${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
+                                               '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
+                                               '${LCGDIR}/ffmpeg/lib/libx264-67.dll']
        if env['WITH_BF_JACK']:
                dllsources += ['${LCGDIR}/jack/lib/libjack.dll']
        windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
@@ -640,12 +653,14 @@ if not env['WITHOUT_BF_INSTALL']:
 
 #------------ EPYDOC
 if env['WITH_BF_DOCS']:
-       try:            import epydoc
-       except: epydoc = None
-       
-       if epydoc:
-               SConscript('source/gameengine/PyDoc/SConscript')
-       else:
-               print "No epydoc install detected, Python API and Gameengine API Docs will not be generated "
-       
+    try:
+        import epydoc
+    except ImportError:
+        epydoc = None
+
+    if epydoc:
+        SConscript('source/gameengine/PyDoc/SConscript')
+    else:
+        print "No epydoc install detected, Python API and Gameengine API Docs will not be generated "
+