# check available boost libs (since lyx1.4 does not use iostream)
boost_libs = []
-for lib in ['signals', 'regex', 'filesystem', 'iostreams']:
+for lib in ['signals', 'regex', 'filesystem']:
if os.path.isdir(os.path.join(top_src_dir, 'boost', 'libs', lib)):
boost_libs.append(lib)
#('newapis.h', 'HAVE_NEWAPIS_H', 'c'),
],
custom_tests = [
- (env.has_key('assertions') and env['assertions'],
+ (env.has_key('assertions') and env['assertions'] and devel_version,
'ENABLE_ASSERTIONS',
'Define if you want assertions to be enabled in the code'
),
#
# src/support
#
+frontend_env['QT4_MOCHPREFIX'] = ''
+frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp'
+
+support_moced_files = [frontend_env.Moc4('$BUILDDIR/src/support/%s' % x)
+ for x in src_support_header_files ]
support = frontend_env.StaticLibrary(
target = '$LOCALLIBPATH/support',
source = ['$BUILDDIR/src/support/%s' % x for x in src_support_files] + \
'-DQT_NO_STL',
'-DQT_NO_KEYWORDS',
],
- CPPPATH = ['$CPPPATH', '$TOP_SRCDIR/src/support/minizip']
+ CPPPATH = ['$CPPPATH', '$BUILDDIR/src/support', '$TOP_SRCDIR/src/support/minizip']
)
Alias('support', support)
#
# src/frontend/qt4
#
-frontend_env['QT4_MOCHPREFIX'] = ''
-frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp'
-
# tells scons how to get these moced files, although not all moced files are needed
# (or are actually generated).
qt4_moced_files = [frontend_env.Moc4('$BUILDDIR/src/frontends/qt4/%s' % x)
resource = frontend_env.Qrc(frontend_env.qtResource(
'$BUILDDIR/src/frontends/qt4/Resource.qrc',
['$TOP_SRCDIR/lib/images/%s' % x for x in lib_images_files] +
- ['$TOP_SRCDIR/lib/images/math/%s' % x for x in lib_images_math_files]))
+ ['$TOP_SRCDIR/lib/images/math/%s' % x for x in lib_images_math_files] +
+ ['$TOP_SRCDIR/lib/images/commands/%s' % x for x in lib_images_commands_files]))
#
# moc qt4_moc_files, the moced files are included in the original files
#
['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_header_files + src_insets_files] + \
['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_header_files + src_frontends_files] + \
['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_header_files + src_graphics_files] + \
- ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_header_files + src_frontends_qt4_files + src_frontends_qt4_moc_files] + \
+ ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_header_files + src_frontends_qt4_files] + \
['$TOP_SRCDIR/src/client/%s' % x for x in src_client_header_files + src_client_files ] + \
['$TOP_SRCDIR/src/tex2lyx/%s' % x for x in src_tex2lyx_header_files + src_tex2lyx_files ]
)
('bind/fi', lib_bind_fi_files),
('bind/pt', lib_bind_pt_files),
('bind/sv', lib_bind_sv_files),
+ ('commands', lib_commands_files),
('doc', lib_doc_files),
('doc/biblio', lib_doc_biblio_files),
('doc/clipart', lib_doc_clipart_files),
('doc/de', lib_doc_de_files),
('doc/de/clipart', lib_doc_de_clipart_files),
('doc/es', lib_doc_es_files),
- ('doc/es/biblio', lib_doc_es_biblio_files),
('doc/es/clipart', lib_doc_es_clipart_files),
('doc/eu', lib_doc_eu_files),
('doc/fr', lib_doc_fr_files),
+ ('doc/fr/clipart', lib_doc_fr_clipart_files),
('doc/he', lib_doc_he_files),
('doc/hu', lib_doc_hu_files),
('doc/it', lib_doc_it_files),
('fonts', lib_fonts_files),
('images', lib_images_files),
('images/math', lib_images_math_files),
+ ('images/commands', lib_images_commands_files),
('kbd', lib_kbd_files),
('layouts', lib_layouts_files + lib_layouts_inc_files + lib_layouts_module_files),
('lyx2lyx', lib_lyx2lyx_files),