diff options
| author | nyamatongwe <unknown> | 2003-08-17 09:55:22 +0000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2003-08-17 09:55:22 +0000 |
| commit | 3a26c5516fdd49139887b65a53f0e65b124f2f5f (patch) | |
| tree | c6b46111ab53320482bacb9e00b64c78b3e297dd | |
| parent | f0b0cd4c31e2195d6647105bcee73191ab3d4b4b (diff) | |
| download | scintilla-mirror-3a26c5516fdd49139887b65a53f0e65b124f2f5f.tar.gz | |
Adapt g++ command line for version installed - 2.x adds -fvtable-thunks.
| -rw-r--r-- | win32/makefile | 5 |
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 \ |