From 6df40c7ebe796e8af9961936db3df1e73d2707a1 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Tue, 3 Jul 2007 20:16:11 +0000 Subject: [PATCH] scons: embed lyx.exe.manifest to lyx.exe, no longer use qt manifest. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18977 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/SConstruct | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index 60ad78c45a..306c98c689 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -1391,20 +1391,13 @@ if frontend == 'qt4': print 'uic or moc command is not found for frontend', frontend Exit(1) - # now, if msvc2005 is used, we will need that QT_LIB_PATH/QT_LIB.manifest file + # now, if msvc2005 is used, we will need to embed lyx.exe.manifest to lyx.exe + # NOTE: previously, lyx.exe had to be linked to some qt manifest to work. + # For some unknown changes in msvc or qt, this is no longer needed. if use_vc: - if mode == 'debug': - if qt_lib_path is not None: - manifest = os.path.join(qt_lib_path, 'QtGuid4.dll.manifest') - else: - manifest = 'QtGuid4.dll.manifest' - else: - if qt_lib_path is not None: - manifest = os.path.join(qt_lib_path, 'QtGui4.dll.manifest') - else: - manifest = 'QtGui4.dll.manifest' - if os.path.isfile(manifest): - frontend_env['LINKCOM'] = [frontend_env['LINKCOM'], 'mt.exe /MANIFEST %s /outputresource:$TARGET;1' % manifest] + frontend_env['LINKCOM'] = [frontend_env['LINKCOM'], \ + 'mt.exe /MANIFEST %s /outputresource:$TARGET;1' % \ + env.subst('$BUILDDIR/lyx.exe.manifest')] frontend_env = conf.Finish()