changeset: 4467:23ef20edf6ba892a78e7e257a28f4879e31f4095 tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Wed May 21 21:09:20 2008 +0200 files: lib-src/ChangeLog lib-src/make-mswin-unicode.pl description: Check %WindowsSdkDir%, %MSSddk% for the Windows header files too. 2008-05-21 Aidan Kehoe <kehoea(a)parhasard.net&gt; * make-mswin-unicode.pl: Check %WindowsSdkDir%, %MSSddk% for the Windows header files too. diff -r 969a957a44ac299b06666f55479fe459c0588d9f -r 23ef20edf6ba892a78e7e257a28f4879e31f4095 lib-src/ChangeLog --- 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-14 Vin Shelton <acs(a)xemacs.org +2008-05-21 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * make-mswin-unicode.pl: + Check %WindowsSdkDir%, %MSSddk% for the Windows header files too. + 2008-05-14 Vin Shelton <acs(a)xemacs.org&gt; * winclient.c: Create CONNECT_RETRIES and increase retry count diff -r 969a957a44ac299b06666f55479fe459c0588d9f -r 23ef20edf6ba892a78e7e257a28f4879e31f4095 lib-src/make-mswin-unicode.pl --- 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 ＠＠ my ($cout, $hout, $dir) = ($options{"c-o $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')); _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches