aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--win32/makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/win32/makefile b/win32/makefile
index 0e9f3564a..794715483 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -13,6 +13,10 @@ DLLWRAP = dllwrap
COMPONENT = ../bin/Scintilla.dll
LEXCOMPONENT = ../bin/SciLexer.dll
+ifndef NOTHUNKS
+THUNKFLAGS=-fvtable-thunks
+endif
+
vpath %.h ../src ../include
vpath %.cxx ../src
@@ -20,7 +24,7 @@ LDFLAGS=-mwindows -lstdc++ -limm32 -lole32 -luuid
# Add -MMD to get dependencies
#CXXFLAGS = -g -pg -pedantic -Os -fno-exceptions -fvtable-thunks -fno-rtti
INCLUDEDIRS=-I ../include -I ../src
-CXXBASEFLAGS = -W -Wall -pedantic $(INCLUDEDIRS) -Os -fno-exceptions -fvtable-thunks -fno-rtti
+CXXBASEFLAGS = -W -Wall -pedantic $(INCLUDEDIRS) -Os -fno-exceptions $(THUNKFLAGS) -fno-rtti
ifdef DEBUG
CXXFLAGS=-DDEBUG $(CXXBASEFLAGS)
@@ -45,7 +49,7 @@ LEXOBJS=\
LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o \
LexCrontab.o LexCSS.o LexEiffel.o LexFortran.o LexHTML.o LexLisp.o LexLua.o \
LexMatlab.o LexOthers.o LexPascal.o LexPerl.o LexPOV.o LexPython.o LexRuby.o \
-LexSQL.o LexVB.o
+LexSQL.o LexVB.o
#--Autogenerated -- end of automatically generated section
SOBJS = ScintillaWin.o ScintillaBase.o Editor.o Document.o \