From 8cb6d72b42aeda90f6127f7d78d0a8461424aaf5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sun, 15 May 2011 01:47:14 +0000 Subject: [PATCH] SCons: to be able to compile with MSVC 2010 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38759 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/SConstruct | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index a23b07f00b..1c33dcd692 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -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() -- 2.39.2