Add a cache for converted image files. This needs to be enabled in the

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index e7e9e98c5538348831c951cf26ba3bf90eaae3bd..63229e6beaac26529704524182feaeedd687e879 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -126,7 +126,7 @@ opts = Options(['config.py'])
 opts.AddOptions(
     # frontend
     EnumOption('frontend', 'Main GUI', default_frontend,
-        allowed_values = ('qt4', 'gtk') ),
+        allowed_values = ('qt4',) ),
     # debug or release build
     EnumOption('mode', 'Building method', default_build_mode,
         allowed_values = ('debug', 'release') ),
@@ -895,6 +895,10 @@ utils.createConfigFile(conf,
 #  define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
 #endif
 
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
+#  define LIBC_WCTYPE_USES_UCS4
+#endif
+
 #endif
 '''
 )
@@ -982,6 +986,7 @@ result = utils.createConfigFile(conf,
     ],
     functions = [
         ('open', 'HAVE_OPEN', None),
+        ('chmod', 'HAVE_CHMOD', None),
         ('close', 'HAVE_CLOSE', None),
         ('popen', 'HAVE_POPEN', None),
         ('pclose', 'HAVE_PCLOSE', None),
@@ -1790,14 +1795,15 @@ if build_tex2lyx:
     tex2lyx_env.Prepend(CPPPATH = ['$BUILDDIR/common/tex2lyx'])
     tex2lyx_env.AppendUnique(LIBPATH = ['#$LOCALLIBPATH'])
 
-    for file in ['FloatList.C', 'Floating.C', 'counters.C', 'lyxlayout.h', 'lyxlayout.C',
+    for file in ['FloatList.C', 'Floating.C', 'counters.C', 'gettext.h', 'gettext.C', 
+        'lyxlayout.h', 'lyxlayout.C', 'messages.h', 'messages.C',
         'lyxtextclass.h', 'lyxtextclass.C', 'lyxlex.C', 'lyxlex_pimpl.C']:
         env.Command('$BUILDDIR/common/tex2lyx/'+file, '$TOP_SRCDIR/src/'+file,
             [Copy('$TARGET', '$SOURCE')])
 
     tex2lyx = tex2lyx_env.Program(
         target = '$BUILDDIR/common/tex2lyx/tex2lyx',
-        LIBS = ['support'] + boost_libraries + system_libs,
+        LIBS = ['support'] + boost_libraries + intl_libs + system_libs,
         source = ['$BUILDDIR/common/tex2lyx/%s' % x for x in src_tex2lyx_files]
     )
     Alias('tex2lyx', env.Command(os.path.join('$BUILDDIR', os.path.split(str(tex2lyx[0]))[1]),
@@ -1862,10 +1868,6 @@ if build_lyx:
             socket_libs +
             system_libs
     )
-    # [/path/to/lyx.ext] => lyx-qt3.ext
-    target_name = os.path.split(str(lyx[0]))[1].replace('lyx', 'lyx-%s' % frontend)
-    Alias('lyx', env.Command(os.path.join('$BUILDDIR', target_name), lyx,
-        [Copy('$TARGET', '$SOURCE')]))
     Alias('lyx', lyx)
 else:
     # define lyx even if lyx is not built with rebuild=no
@@ -1951,27 +1953,26 @@ if build_msvs_projects:
     #
     build_project('lyxbase', src = ['$TOP_SRCDIR/src/%s' % x for x in src_pre_files + src_post_files],
         inc = ['$TOP_SRCDIR/src/%s' % x for x in src_header_files])
-    else:
-        build_project('lyx', 
-            src = ['$TOP_SRCDIR/src/%s' % x for x in src_pre_files + src_post_files] + \
-                ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_files] + \
-                ['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_files] + \
-                ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_files] + \
-                ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_files] + \
-                ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_files] + \
-                ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_files] + \
-                ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files + src_frontends_qt4_moc_files],
-            inc = ['$TOP_SRCDIR/src/%s' % x for x in src_header_files] + \
-                ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files] + \
-                ['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_header_files] + \
-                ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_header_files] + \
-                ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_header_files] + \
-                ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_header_files] + \
-                ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_header_files] + \
-                ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_header_files],
-            res = ['$TOP_SRCDIR/src/frontends/qt4/ui/%s' % x for x in src_frontends_qt4_ui_files],
-            rebuildTargetOnly = False,
-            full_target = File(env.subst('$BUILDDIR/$frontend/lyx$PROGSUFFIX')).abspath)
+    build_project('lyx', 
+        src = ['$TOP_SRCDIR/src/%s' % x for x in src_pre_files + src_post_files] + \
+            ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_files] + \
+            ['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_files] + \
+            ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_files] + \
+            ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_files] + \
+            ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_files] + \
+            ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_files] + \
+            ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files + src_frontends_qt4_moc_files],
+        inc = ['$TOP_SRCDIR/src/%s' % x for x in src_header_files] + \
+            ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files] + \
+            ['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_header_files] + \
+            ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_header_files] + \
+            ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_header_files] + \
+            ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_header_files] + \
+            ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_header_files] + \
+            ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_header_files],
+        res = ['$TOP_SRCDIR/src/frontends/qt4/ui/%s' % x for x in src_frontends_qt4_ui_files],
+        rebuildTargetOnly = False,
+        full_target = File(env.subst('$BUILDDIR/$frontend/lyx$PROGSUFFIX')).abspath)
 
 
 if build_po: