Mercurial > hg > xemacs-beta
changeset 4467:23ef20edf6ba
Check %WindowsSdkDir%, %MSSddk% for the Windows header files too.
2008-05-21 Aidan Kehoe <kehoea@parhasard.net>
* make-mswin-unicode.pl:
Check %WindowsSdkDir%, %MSSddk% for the Windows header files too.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 21 May 2008 21:09:20 +0200 |
| parents | 969a957a44ac |
| children | a78d697ccd2c d9fcb5442c95 |
| files | lib-src/ChangeLog lib-src/make-mswin-unicode.pl |
| diffstat | 2 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Wed May 21 21:07:26 2008 +0200 +++ b/lib-src/ChangeLog Wed May 21 21:09:20 2008 +0200 @@ -1,3 +1,8 @@ +2008-05-21 Aidan Kehoe <kehoea@parhasard.net> + + * make-mswin-unicode.pl: + Check %WindowsSdkDir%, %MSSddk% for the Windows header files too. + 2008-05-14 Vin Shelton <acs@xemacs.org> * winclient.c: Create CONNECT_RETRIES and increase retry count
--- a/lib-src/make-mswin-unicode.pl Wed May 21 21:07:26 2008 +0200 +++ b/lib-src/make-mswin-unicode.pl Wed May 21 21:09:20 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'));