diff options
| -rw-r--r-- | win32/SciTE.properties | 18 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 3 | ||||
| -rw-r--r-- | win32/makefile | 8 | ||||
| -rw-r--r-- | win32/scintilla.mak | 11 |
4 files changed, 26 insertions, 14 deletions
diff --git a/win32/SciTE.properties b/win32/SciTE.properties index 446aad209..d90f1971a 100644 --- a/win32/SciTE.properties +++ b/win32/SciTE.properties @@ -1,7 +1,11 @@ -command.build.scintilla.mak=nmake -f $(FileNameExt) -command.name.1.scintilla.mak=nmake clean -command.1.scintilla.mak=nmake -f $(FileNameExt) clean -command.name.2.scintilla.mak=Borland Make -command.2.scintilla.mak=make -f $(FileNameExt) -command.name.3.scintilla.mak=make clean -command.3.scintilla.mak=make -f $(FileNameExt) clean +command.build.*.mak=nmake -f $(FileNameExt) +command.name.1.*.mak=nmake clean +command.1.*.mak=nmake -f $(FileNameExt) clean +command.name.2.*.mak=Borland Make +command.2.*.mak=make -f $(FileNameExt) +command.name.3.*.mak=make clean +command.3.*.mak=make -f $(FileNameExt) clean +command.name.4.*.mak=make debug +command.4.*.mak=make DEBUG=1 -f $(FileNameExt) +command.name.5.*.mak=nmake debug +command.5.*.mak=nmake DEBUG=1 -f $(FileNameExt) diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 741870a20..b7b10a261 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -7,6 +7,7 @@ #include <string.h> #include <stdio.h> #include <ctype.h> +#include <assert.h> #include "Platform.h" @@ -295,7 +296,7 @@ LRESULT ScintillaWin::WndPaint(unsigned long wParam) { paintState = painting; PAINTSTRUCT ps; PAINTSTRUCT* pps; - +//assert(wParam); bool IsOcxCtrl = (wParam != 0); // if wParam != 0, it contains // a PAINSTRUCT* from the OCX if(IsOcxCtrl) diff --git a/win32/makefile b/win32/makefile index c52aa2ffb..eb4e37327 100644 --- a/win32/makefile +++ b/win32/makefile @@ -18,7 +18,13 @@ LDFLAGS = -lkernel32 -luser32 -lgdi32 -limm32 -lole32 -luuid # Add -MMD to get dependencies #CXXFLAGS = -g -pg -pedantic -Os -fno-exceptions -fvtable-thunks -fno-rtti INCLUDEDIRS=-I ../include -I ../src -CXXFLAGS = -W -Wall -pedantic $(INCLUDEDIRS) -Os -fno-exceptions -fvtable-thunks -fno-rtti +CXXBASEFLAGS = -W -Wall -pedantic $(INCLUDEDIRS) -Os -fno-exceptions -fvtable-thunks -fno-rtti + +ifdef DEBUG +CXXFLAGS=-DDEBUG $(CXXBASEFLAGS) +else +CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS) +endif .cxx.o: $(CC) $(CXXFLAGS) -c $< -o $@ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index afcb34719..4f3efc4ef 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -8,7 +8,8 @@ # nmake -f scintilla.mak # Usage for Borland: # make -f scintilla.mak -# For debug versions define DEBUG on the command line. +# For debug versions define DEBUG on the command line, for Borland: +# make DEBUG=1 -f scintilla.mak # The main makefile uses mingw32 gcc and may be more current than this file. .SUFFIXES: .cxx @@ -37,8 +38,8 @@ LD=link INCLUDEDIRS=-I ../include -I ../src CXXFLAGS=/TP /W4 # For something scary:/Wp64 -CXXDEBUG=/Zi /Od /MDd -CXXNDEBUG=/Ox /MD +CXXDEBUG=/Zi /Od /MDd -DDEBUG +CXXNDEBUG=/Ox /MD -DNDEBUG NAMEFLAG=-Fo LDFLAGS=/opt:nowin98 LDDEBUG=/DEBUG @@ -55,8 +56,8 @@ INCLUDEDIRS=-I../include -I../src CXXFLAGS = -v CXXFLAGS=-P -tWM -w -w-prc -w-inl -RT- -x- # Above turns off warnings for clarfying parentheses and inlines with for not expanded -CXXDEBUG=-v -CXXNDEBUG=-O1 +CXXDEBUG=-v -DDEBUG +CXXNDEBUG=-O1 -DNDEBUG NAMEFLAG=-o LDFLAGS= LDDEBUG=-v |