From: Bo Peng <bpeng@lyx.org>
Date: Wed, 13 Dec 2006 04:55:41 +0000 (+0000)
Subject: Scons: add support for QtCore in support (and tex2lyx and client)
X-Git-Tag: 1.6.10~11569
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d213175b85b39858336c79eacf38868bcc07a7fd;p=features.git

Scons: add support for QtCore in support (and tex2lyx and client)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16261 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 15589edb5a..4a6a78e55c 100644
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -1300,6 +1300,7 @@ if frontend == 'qt4':
         else:
             qt_lib_suffix = ''
     frontend_libs = [x + qt_lib_suffix for x in qt_libs]
+    qtcore_lib = ['QtCore' + qt_lib_suffix]
 
 
 if env['ICONV_LIB'] is None:
@@ -1624,7 +1625,8 @@ if build_support:
 
     support = env.StaticLibrary(
         target = '$LOCALLIBPATH/support',
-        source = ['$BUILDDIR/common/support/%s' % x for x in src_support_files]
+        source = ['$BUILDDIR/common/support/%s' % x for x in src_support_files],
+        CPPPATH = ['$CPPPATH', qt_inc_path]
     )
     Alias('support', support)
 
@@ -1700,8 +1702,6 @@ if build_controllers:
 if build_qt4:
     env.BuildDir('$BUILDDIR/$frontend', '$TOP_SRCDIR/src/frontend/$frontend', duplicate = 0)
 
-
-if build_qt4:
     print "Processing files in src/frontends/qt4..."
 
     qt4env = env.Copy()
@@ -1771,7 +1771,7 @@ if build_client:
         client = env.Program(
             target = '$BUILDDIR/common/client/lyxclient',
             LIBS = ['support'] + intl_libs + system_libs +
-                socket_libs + boost_libraries,
+                socket_libs + boost_libraries + qtcore_lib,
             source = ['$BUILDDIR/common/client/%s' % x for x in src_client_files]
         )
         Alias('client', env.Command(os.path.join('$BUILDDIR', os.path.split(str(client[0]))[1]),
@@ -1805,7 +1805,7 @@ if build_tex2lyx:
 
     tex2lyx = tex2lyx_env.Program(
         target = '$BUILDDIR/common/tex2lyx/tex2lyx',
-        LIBS = ['support'] + boost_libraries + intl_libs + system_libs,
+        LIBS = ['support'] + boost_libraries + intl_libs + system_libs + qtcore_lib,
         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]),