Mercurial > hg > xemacs-beta

diff lib-src/make-mswin-unicode.pl @ 4558:d9fcb5442c95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with file:/Sources/xemacs-21.5-checked-out
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 21 May 2008 21:47:42 +0200
parents 23ef20edf6ba
children 50861fea97f6
line wrap: on
line diff
--- a/lib-src/make-mswin-unicode.pl	Tue May 13 20:26:47 2008 +0200
+++ b/lib-src/make-mswin-unicode.pl	Wed May 21 21:47:42 2008 +0200
@@ -104,7 +104,17 @@
                           $options{"includedir"});
 if (!$dir)
   {
-    $dir=$ENV{"MSVCDIR"} or die "Environment variable MSVCDIR undefined - run vcvars32.bat from your MSVC installation";
+    for my $sdkroot (("WindowsSdkDir", "MSSdk", "MSVCDIR"))
+      {
+        if (defined $ENV{$sdkroot}) {
+          $dir = $ENV{$sdkroot};
+          last;
+        }
+      }
+    unless (defined $dir)
+      {
+        die "Can't find the Windows SDK headers; run vcvars32.bat from your MSVC installation, or setenv.cmd from the Platform SDK installation";
+      }
     $dir.='/include';
   }
 die "Can't find MSVC include files in \"$dir\"" unless ((-f $dir.'/WINDOWS.H') || (-f $dir.'/windows.h'));