diff options
| author | nyamatongwe <devnull@localhost> | 2012-07-16 20:18:31 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2012-07-16 20:18:31 +1000 |
| commit | 634e7ef19b547721119e963c51e4af16d6b88f46 (patch) | |
| tree | 2a5198deeab23ea798518ade0c434078b4494518 | |
| parent | 28359bf31e4f696901245bc955df74fd8bdda4bf (diff) | |
| download | scintilla-mirror-634e7ef19b547721119e963c51e4af16d6b88f46.tar.gz | |
Reenable building for Windows NT 4 on NT 4.
| -rw-r--r-- | win32/PlatWin.cxx | 6 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 6 | ||||
| -rw-r--r-- | win32/makefile | 9 |
3 files changed, 19 insertions, 2 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index d791ff45b..aad7bcf24 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -18,7 +18,11 @@ #include <map> #undef _WIN32_WINNT -#define _WIN32_WINNT 0x0500 +#ifdef WIN_TARGET +#define _WIN32_WINNT WIN_TARGET +#else +#define _WIN32_WINNT 0x0500 +#endif #include <windows.h> #include <commctrl.h> #include <richedit.h> diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 80abc69d9..e92bd7b13 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -18,7 +18,11 @@ #include <map> #undef _WIN32_WINNT -#define _WIN32_WINNT 0x0500 +#ifdef WIN_TARGET +#define _WIN32_WINNT WIN_TARGET +#else +#define _WIN32_WINNT 0x0500 +#endif #include <windows.h> #include <commctrl.h> #include <richedit.h> diff --git a/win32/makefile b/win32/makefile index c71997c65..6d2846feb 100644 --- a/win32/makefile +++ b/win32/makefile @@ -8,6 +8,15 @@ CC = g++ DEL = del /q +# Discover Windows version by running 'VER' command and parsing output +# For Windows 2000 looks like:Microsoft Windows 2000 [Version 5.00.2195] +WINVERWORDS:=$(wordlist 1,2,$(subst ., ,$(lastword $(shell ver)))) +WINVER:=$(firstword $(WINVERWORDS)).$(lastword $(WINVERWORDS)) +# Windows NT 4 does not support GetMonitorInfo +ifeq '$(WINVER)' '4.0' + VERSION_DEFINES:=-DWIN_TARGET=0x0400 +endif + COMPONENT = ../bin/Scintilla.dll LEXCOMPONENT = ../bin/SciLexer.dll LEXLIB = Lexers.a |