Grease Pencil: Basic Support for Image Editor Again
[blender.git] / SConstruct
index b85bc799ea5a11729018ddc08c15c7224140486b..f2eb7146930b79e7804871389a1cfea05e4f7195 100644 (file)
@@ -31,6 +31,7 @@
 
 import platform as pltfrm
 
+# Need a better way to do this. Automagical maybe is not the best thing, maybe it is.
 if pltfrm.architecture()[0] == '64bit':
        bitness = 64
 else:
@@ -59,7 +60,6 @@ B = tools.Blender
 platform = sys.platform
 quickie = None
 quickdebug = None
-nsis_build = None
 
 ##### BEGIN SETUP #####
 
@@ -424,8 +424,6 @@ if  env['OURPLATFORM']=='darwin':
                bundle = '%s.app' % prg[0]
                bundledir = os.path.dirname(bundle)
                for dp, dn, df in os.walk(bundle):
-                       if 'CVS' in dn:
-                               dn.remove('CVS')
                        if '.svn' in dn:
                                dn.remove('.svn')
                        dir=env['BF_INSTALLDIR']+dp[len(bundledir):]
@@ -442,8 +440,6 @@ scriptinstall = []
 
 if  env['OURPLATFORM']!='darwin':
                for dp, dn, df in os.walk('bin/.blender'):
-                       if 'CVS' in dn:
-                               dn.remove('CVS')
                        if '.svn' in dn:
                                dn.remove('.svn')
                        
@@ -470,8 +466,6 @@ if  env['OURPLATFORM']!='darwin':
                        scriptpaths=['release/scripts', 'release/ui', 'release/io']
                        for scriptpath in scriptpaths:
                                for dp, dn, df in os.walk(scriptpath):
-                                       if 'CVS' in dn:
-                                               dn.remove('CVS')
                                        if '.svn' in dn:
                                                dn.remove('.svn')
                                        dir=env['BF_INSTALLDIR']+'/.blender/'+os.path.basename(scriptpath)+dp[len(scriptpath):]
@@ -484,8 +478,6 @@ if env['OURPLATFORM']=='linux2':
        icontargetlist = []
 
        for tp, tn, tf in os.walk('release/freedesktop/icons'):
-               if 'CVS' in tn:
-                       tn.remove('CVS')
                if '.svn' in tn:
                        tn.remove('.svn')
                for f in tf:
@@ -508,8 +500,6 @@ if env['OURPLATFORM']=='linuxcross':
 pluglist = []
 plugtargetlist = []
 for tp, tn, tf in os.walk('release/plugins'):
-       if 'CVS' in tn:
-               tn.remove('CVS')
        if '.svn' in tn:
                tn.remove('.svn')
        for f in tf:
@@ -540,8 +530,6 @@ for targetdir,srcfile in zip(plugtargetlist, pluglist):
 textlist = []
 texttargetlist = []
 for tp, tn, tf in os.walk('release/text'):
-       if 'CVS' in tn:
-               tn.remove('CVS')
        if '.svn' in tn:
                tn.remove('.svn')
        for f in tf:
@@ -573,8 +561,8 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'):
        if env['WITH_BF_PYTHON']:
                ver = env["BF_PYTHON_VERSION"].replace(".", "")
                
-               dllsources.append('#release/windows/extra/python' + ver + '.zip')
-               dllsources.append('#release/windows/extra/zlib.pyd')
+               dllsources.append('${LCGDIR}/release/python' + ver + '.zip')
+               dllsources.append('${LCGDIR}/release/zlib.pyd')
                if env['BF_DEBUG']:
                        dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}_d.dll')
                else:
@@ -584,17 +572,22 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'):
                        pass # we link statically to iconv on win64
                else:
                        dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll']
+       if env['WITH_BF_OPENAL']:
+               dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
+               dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
        if env['WITH_BF_FFMPEG']:
                dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-52.dll',
                                                '${LCGDIR}/ffmpeg/lib/avformat-52.dll',
                                                '${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
                                                '${LCGDIR}/ffmpeg/lib/avutil-50.dll',
-                                               '${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
-                                               '${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
-                                               '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
-                                               '${LCGDIR}/ffmpeg/lib/libx264-67.dll',
-                                               '${LCGDIR}/ffmpeg/lib/xvidcore.dll',
+#                                              '${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
+#                                              '${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
+#                                              '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
+#                                              '${LCGDIR}/ffmpeg/lib/libx264-67.dll',
+#                                              '${LCGDIR}/ffmpeg/lib/xvidcore.dll',
                                                '${LCGDIR}/ffmpeg/lib/swscale-0.dll']
+       if env['WITH_BF_JACK']:
+               dllsources += ['${LCGDIR}/jack/lib/libjack.dll']
        windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
        allinstall += windlls