diff options
| -rw-r--r-- | win32/makefile | 11 | ||||
| -rw-r--r-- | win32/scintilla.mak | 17 |
2 files changed, 21 insertions, 7 deletions
diff --git a/win32/makefile b/win32/makefile index 54a071a75..5464740f0 100644 --- a/win32/makefile +++ b/win32/makefile @@ -37,10 +37,13 @@ clean: deps: $(CC) -MM $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak -LEXOBJS=LexAda.o LexAVE.o LexBaan.o LexBullant.o LexConf.o \ - LexCPP.o LexCrontab.o LexEiffel.o LexHTML.o \ - LexLisp.o LexLua.o LexMatlab.o LexOthers.o LexPascal.o LexPerl.o \ - LexPython.o LexRuby.o LexSQL.o LexVB.o +#++Autogenerated -- run src/LexGen.py to regenerate +#**LEXOBJS=\\\n\(\*.o \) +LEXOBJS=\ +LexAda.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o LexCrontab.o \ +LexEiffel.o LexHTML.o LexLisp.o LexLua.o LexMatlab.o LexOthers.o LexPascal.o \ +LexPerl.o LexPython.o LexRuby.o LexSQL.o LexVB.o +#--Autogenerated -- end of automatically generated section SOBJS = ScintillaWin.o ScintillaBase.o Editor.o Document.o \ ContractionState.o CellBuffer.o CallTip.o \ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 3bc63f0af..897ef2c16 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -39,10 +39,11 @@ INCLUDEDIRS=-I ../include -I ../src CXXFLAGS=/TP /W4 # For something scary:/Wp64 CXXDEBUG=/Zi /Od /MDd -DDEBUG -CXXNDEBUG=/Og /Os /Oy /MD -DNDEBUG +xCXXNDEBUG=/Og /Os /Oy /MD -DNDEBUG +CXXNDEBUG=/O1 /GL /MT -DNDEBUG #CXXNDEBUG=/Ox /MD -DNDEBUG NAMEFLAG=-Fo -LDFLAGS=/opt:nowin98 +LDFLAGS=/opt:nowin98 /opt:ref /LTCG LDDEBUG=/DEBUG LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.LIB @@ -104,6 +105,8 @@ SOBJS=\ $(DIR_O)\UniConversion.obj \ $(DIR_O)\ViewStyle.obj +#++Autogenerated -- run src/LexGen.py to regenerate +#**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\) LEXOBJS=\ $(DIR_O)\LexAda.obj \ $(DIR_O)\LexAVE.obj \ @@ -123,7 +126,9 @@ LEXOBJS=\ $(DIR_O)\LexPython.obj \ $(DIR_O)\LexRuby.obj \ $(DIR_O)\LexSQL.obj \ - $(DIR_O)\LexVB.obj + $(DIR_O)\LexVB.obj \ + +#--Autogenerated -- end of automatically generated section LOBJS=\ $(DIR_O)\AutoComplete.obj \ @@ -228,6 +233,9 @@ $(DIR_O)\KeyWords.obj: ..\src\KeyWords.cxx ..\include\Platform.h ..\include\Prop ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ ..\include\Scintilla.h ..\include\SciLexer.h +#++Autogenerated -- run src/LexGen.py to regenerate +#**\n\($(DIR_O)\\\*.obj: ..\\src\\\*.cxx $(LEX_HEADERS)\n\n\) + $(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS) $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS) @@ -266,6 +274,9 @@ $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS) $(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS) + +#--Autogenerated -- end of automatically generated section + $(DIR_O)\LineMarker.obj: ..\src\LineMarker.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\LineMarker.h $(DIR_O)\PlatWin.obj: PlatWin.cxx ..\include\Platform.h PlatformRes.h ..\src\UniConversion.h |