anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scons: embed lyx.exe.manifest to lyx.exe, no longer use qt manifest.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18977 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2007-07-03 20:16:11 +00:00
parent b8b66e8278
commit 6df40c7ebe
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
development/scons/SConstruct
View File

@ -1391,20 +1391,13 @@ if frontend == 'qt4':
print 'uic or moc command is not found for frontend', frontend print 'uic or moc command is not found for frontend', frontend
Exit(1) 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 use_vc:
if mode == 'debug': frontend_env['LINKCOM'] = [frontend_env['LINKCOM'], \
if qt_lib_path is not None: 'mt.exe /MANIFEST %s /outputresource:$TARGET;1' % \
manifest = os.path.join(qt_lib_path, 'QtGuid4.dll.manifest') env.subst('$BUILDDIR/lyx.exe.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 = conf.Finish() frontend_env = conf.Finish()