aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--win32/makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/win32/makefile b/win32/makefile
index e3aca03d9..84c7ebe04 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -14,8 +14,11 @@ COMPONENT = ../bin/Scintilla.dll
LEXCOMPONENT = ../bin/SciLexer.dll
ifndef NOTHUNKS
+gversion = $(word 1,$(subst ., ,$(shell g++ --version)))
+ifeq ($(gversion),2)
THUNKFLAGS=-fvtable-thunks
endif
+endif
vpath %.h ../src ../include
vpath %.cxx ../src
@@ -50,7 +53,7 @@ LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o \
LexCrontab.o LexCSS.o LexEiffel.o LexEScript.o LexFortran.o LexHTML.o \
LexLisp.o LexLout.o LexLua.o LexMatlab.o LexMMIXAL.o LexNsis.o LexOthers.o \
LexPascal.o LexPerl.o LexPOV.o LexPS.o LexPython.o LexRuby.o LexScriptol.o \
-LexSQL.o LexVB.o
+LexSQL.o LexVB.o
#--Autogenerated -- end of automatically generated section
SOBJS = ScintillaWin.o ScintillaBase.o Editor.o Document.o \