anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16261 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2006-12-13 04:55:41 +00:00
parent 525e28f520
commit d213175b85
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
development/scons/SConstruct
View File

@ -1300,6 +1300,7 @@ if frontend == 'qt4':
else: else:
qt_lib_suffix = '' qt_lib_suffix = ''
frontend_libs = [x + qt_lib_suffix for x in qt_libs] frontend_libs = [x + qt_lib_suffix for x in qt_libs]
qtcore_lib = ['QtCore' + qt_lib_suffix]
if env['ICONV_LIB'] is None: if env['ICONV_LIB'] is None:
@ -1624,7 +1625,8 @@ if build_support:
support = env.StaticLibrary( support = env.StaticLibrary(
target = '$LOCALLIBPATH/support', 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) Alias('support', support)
@ -1700,8 +1702,6 @@ if build_controllers:
if build_qt4: if build_qt4:
env.BuildDir('$BUILDDIR/$frontend', '$TOP_SRCDIR/src/frontend/$frontend', duplicate = 0) env.BuildDir('$BUILDDIR/$frontend', '$TOP_SRCDIR/src/frontend/$frontend', duplicate = 0)
if build_qt4:
print "Processing files in src/frontends/qt4..." print "Processing files in src/frontends/qt4..."
qt4env = env.Copy() qt4env = env.Copy()
@ -1771,7 +1771,7 @@ if build_client:
client = env.Program( client = env.Program(
target = '$BUILDDIR/common/client/lyxclient', target = '$BUILDDIR/common/client/lyxclient',
LIBS = ['support'] + intl_libs + system_libs + 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] 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]), 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( tex2lyx = tex2lyx_env.Program(
target = '$BUILDDIR/common/tex2lyx/tex2lyx', 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] 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]), Alias('tex2lyx', env.Command(os.path.join('$BUILDDIR', os.path.split(str(tex2lyx[0]))[1]),