diff options
| author | nyamatongwe <devnull@localhost> | 2012-07-17 12:49:28 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2012-07-17 12:49:28 +1000 |
| commit | b4813cbdd4fe867c276b363e597b32f6a82a58dd (patch) | |
| tree | ea60b9bdf12f85881b53d326c1054367e6e44b98 /win32/makefile | |
| parent | 53e387e1732fd009c9d952a6423493a69befef7f (diff) | |
| download | scintilla-mirror-b4813cbdd4fe867c276b363e597b32f6a82a58dd.tar.gz | |
MultiMon.h can cause multiple definition problems when Scintilla is statically linked.
Avoid these issues and ensure compatibility with NT 4 by not including MultiMon.h and
dynamically linking to the monitor APIs when available. If not available use the
single monitor work area to define the available area.
Diffstat (limited to 'win32/makefile')
| -rw-r--r-- | win32/makefile | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/win32/makefile b/win32/makefile index 4339cde7c..c71997c65 100644 --- a/win32/makefile +++ b/win32/makefile @@ -8,15 +8,6 @@ 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 @@ -28,7 +19,7 @@ LDFLAGS=-shared -static -Wl,--enable-runtime-pseudo-reloc-v2 -mwindows -Wl,--add LIBS=-lstdc++ -limm32 -lole32 -luuid # Add -MMD to get dependencies INCLUDEDIRS=-I ../include -I ../src -I../lexlib -CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic $(INCLUDEDIRS) -fno-rtti $(VERSION_DEFINES) +CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic $(INCLUDEDIRS) -fno-rtti ifdef DEBUG CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) |