plosh output. We need a string for LYX_DATE

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 306c98c68994435925e3a409b35ff2e9417547ac..687366f2607ffcf09f7a56778a128346034463ee 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -607,6 +607,11 @@ conf = Configure(env,
     }
 )
 
+# When using msvc, windows.h is required
+if use_vc and not conf.CheckCHeader('windows.h'):
+    print 'Windows.h is not found. Please install Windows Platform SDK.'
+    Exit(1)
+
 # pkg-config? (if not, we use hard-coded options)
 if conf.CheckPkgConfig('0.15.0'):
     env['HAS_PKG_CONFIG'] = True
@@ -1397,7 +1402,7 @@ if frontend == 'qt4':
     if use_vc:
         frontend_env['LINKCOM'] = [frontend_env['LINKCOM'], \
             'mt.exe /MANIFEST %s /outputresource:$TARGET;1' % \
-            env.subst('$BUILDDIR/lyx.exe.manifest')]
+            env.File('$BUILDDIR/lyx.exe.manifest').path]
 
     frontend_env = conf.Finish()