Author: uwestoehr
Date: Sun May 15 03:47:14 2011
New Revision: 38759
URL: http://www.lyx.org/trac/changeset/38759
Log:
SCons: to be able to compile with MSVC 2010
Modified:
lyx-devel/trunk/development/scons/SConstruct
Modified: lyx-devel/trunk/development/scons/SConstruct
==============================================================================
--- lyx-devel/trunk/development/scons/SConstruct Sat May 14 23:35:36
2011 (r38758)
+++ lyx-devel/trunk/development/scons/SConstruct Sun May 15 03:47:14
2011 (r38759)
@@ -1055,6 +1055,8 @@
'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 @@
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()
