Hi, On Fri, Jul 24, 2020 at 05:14:45PM +0300, Lev Stipakov wrote: > From: Lev Stipakov <l...@openvpn.net> > > Add manifest file to detect Windows versions greater than Windows 8.
NAK, this breaks Ubuntu/MinGW builds. Actually, I think it breaks all
windows builds, if you build from tarballs (which the "generic" build does -
first, make dist, then, build from there).
You introduce an include to "openvpn.manifest", but this is not bundled,
so
i686-w64-mingw32-windres -DHAVE_CONFIG_H -I. -I../.. -I../../include
-I../../include -I../../src/compat -DWIN32_LEAN_AND_MEAN
-DNTDDI_VERSION=NTDDI_VISTA -D_WIN32_WINNT=_WIN32_WINNT_VISTA -i
"openvpn_win32_resources.rc" -o "openvpn_win32_resources.o"
i686-w64-mingw32-windres: can't open file `openvpn.manifest': No such file or
directory
Makefile:933: recipe for target 'openvpn_win32_resources.o' failed
make[4]: *** [openvpn_win32_resources.o] Error 1
make[4]: *** Waiting for unfinished jobs....
And this is what breaks MinGW builds:
../../src/compat/compat-versionhelpers.h: In function 'IsWindows10OrGreater':
../../src/compat/compat-versionhelpers.h:101:45: error:
'_WIN32_WINNT_WINTHRESHOLD' undeclared (first use in this function); did you
mean '_WIN32_WINNT_WINBLUE'?
return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINTHRESHOLD),
LOBYTE(_WIN32_WINNT_WINTHRESHOLD), 0);
^
../../src/compat/compat-versionhelpers.h:101:45: note: each undeclared
identifier is reported only once for each function it appears in
possibly the _WIN32_WINNT_WINTHRESHOLD is missing on MinGW, at least the
version bundled with Ubuntu 18.04 (I've skimmed the headers, and it's
missing).
The rest of the code changes look good, and I have no idea what all the
XML files do - but those are relevant for MSVC, and you are the expert
on that ("if you say this is beneficial, I'll merge").
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany g...@greenie.muc.de
signature.asc
Description: PGP signature
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
