From 99d072c0bfbc20afa2122645fe14c952b560f311 Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Sun, 17 Aug 2003 09:55:22 +0000
Subject: Adapt g++ command line for version installed - 2.x adds
 -fvtable-thunks.

---
 win32/makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 \
-- 
cgit v1.2.3