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

SCons: to be able to compile with MSVC 2010

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38759 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-05-15 01:47:14 +00:00
parent b4fc66621d
commit 8cb6d72b42
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
development/scons/SConstruct
View File

@ -1055,6 +1055,8 @@ result = utils.createConfigFile(conf,
'Top source directory'),
('#define BOOST_ALL_NO_LIB 1',
'disable automatic linking of boost libraries.'),
('#define LYX_USE_TR1 1',
'use TR1'),
('#define USE_%s_PACKAGING 1' % packaging_method.upper(),
'Packaging method'),
('#define AIKSAURUS_H_LOCATION ' + aik_location,
@ -1396,13 +1398,12 @@ if frontend == 'qt4':
print 'uic or moc command is not found for frontend', frontend
Exit(1)
# 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:
env['LINKCOM'] = [env['LINKCOM'], \
'mt.exe /MANIFEST %s /outputresource:$TARGET;1' % \
env.File('$BUILDDIR/lyx.exe.manifest').path]
# if MSVC 2005 and 2008 is used, we will need to embed lyx.exe.manifest to lyx.exe
# for MSVC 2010 this is not necessary
#if use_vc:
# env['LINKCOM'] = [env['LINKCOM'], \
# 'mt.exe /MANIFEST %s /outputresource:$TARGET;1' % \
# env.File('$BUILDDIR/lyx.exe.manifest').path]
env = conf.Finish()