mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-04-09 23:28:06 -05:00
Update WINVER to 0x500 to avoid build failures from Jacob's
FlashWindow changes. Also fiddle with the <multimon.h> include, which was subtly broken in turn by that. [originally from svn r7120]
This commit is contained in:
parent
1c081c99be
commit
f437af50f1
@ -473,7 +473,7 @@ if (defined $makefiles{'borland'}) {
|
||||
"MAKEFILE = Makefile.bor\n".
|
||||
"\n".
|
||||
"# C compilation flags\n".
|
||||
"CFLAGS = -D_WINDOWS -DWINVER=0x0401\n".
|
||||
"CFLAGS = -D_WINDOWS -DWINVER=0x0500\n".
|
||||
"# Resource compilation flags\n".
|
||||
"RCFLAGS = -DNO_WINRESRC_H -DWIN32 -D_WIN32 -DWINVER=0x0401\n".
|
||||
"\n".
|
||||
@ -576,7 +576,7 @@ if (defined $makefiles{'vc'}) {
|
||||
"# C compilation flags\n".
|
||||
"CFLAGS = /nologo /W3 /O1 " .
|
||||
(join " ", map {"-I$dirpfx$_"} @srcdirs) .
|
||||
" /D_WINDOWS /D_WIN32_WINDOWS=0x401 /DWINVER=0x401\n".
|
||||
" /D_WINDOWS /D_WIN32_WINDOWS=0x500 /DWINVER=0x500\n".
|
||||
"LFLAGS = /incremental:no /fixed\n".
|
||||
"RCFLAGS = -DWIN32 -D_WIN32 -DWINVER=0x0400\n".
|
||||
"\n".
|
||||
|
@ -10,6 +10,10 @@
|
||||
#include <limits.h>
|
||||
#include <assert.h>
|
||||
|
||||
#ifndef NO_MULTIMON
|
||||
#define COMPILE_MULTIMON_STUBS
|
||||
#endif
|
||||
|
||||
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
|
||||
#include "putty.h"
|
||||
#include "terminal.h"
|
||||
@ -17,11 +21,8 @@
|
||||
#include "win_res.h"
|
||||
|
||||
#ifndef NO_MULTIMON
|
||||
#if WINVER < 0x0500
|
||||
#define COMPILE_MULTIMON_STUBS
|
||||
#include <multimon.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <imm.h>
|
||||
#include <commctrl.h>
|
||||
|
Loading…
x
Reference in New Issue
Block a user