diff options
| -rw-r--r-- | src/LexGen.py | 1 | ||||
| -rw-r--r-- | win32/makefile | 20 |
2 files changed, 3 insertions, 18 deletions
diff --git a/src/LexGen.py b/src/LexGen.py index 6f588f4ac..295e484ab 100644 --- a/src/LexGen.py +++ b/src/LexGen.py @@ -290,7 +290,6 @@ def RegenerateAll(): print(propFiles) Regenerate(root + "scintilla/src/Catalogue.cxx", "//", NATIVE, lexerModules) - Regenerate(root + "scintilla/win32/makefile", "#", NATIVE, lexFiles) Regenerate(root + "scintilla/win32/scintilla.mak", "#", NATIVE, lexFiles) Regenerate(root + "scintilla/win32/scintilla_vc6.mak", "#", NATIVE, lexFiles) # Use Unix EOLs for gtk Makefiles so they work for Linux users when diff --git a/win32/makefile b/win32/makefile index 266fbf514..406c9a4c7 100644 --- a/win32/makefile +++ b/win32/makefile @@ -6,7 +6,7 @@ .SUFFIXES: .cxx CC = g++ -DLLWRAP = dllwrap +DLLWRAP = g++ -shared -Wl,--kill-at DEL = del /q COMPONENT = ../bin/Scintilla.dll @@ -39,22 +39,8 @@ clean: deps: $(CC) -MM $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx >deps.mak -#++Autogenerated -- run src/LexGen.py to regenerate -#**LEXOBJS=\\\n\(\*.o \) -LEXOBJS=\ -LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexASY.o LexAU3.o LexAVE.o \ -LexBaan.o LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o \ -LexCOBOL.o LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o \ -LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o \ -LexGAP.o LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o \ -LexLout.o LexLua.o LexMagik.o LexMarkdown.o LexMatlab.o LexMetapost.o \ -LexMMIXAL.o LexMPT.o LexMSSQL.o LexMySQL.o LexNimrod.o LexNsis.o LexOpal.o \ -LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o LexPowerPro.o \ -LexPowerShell.o LexProgress.o LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o \ -LexScriptol.o LexSmalltalk.o LexSML.o LexSorcus.o LexSpecman.o LexSpice.o \ -LexSQL.o LexTACL.o LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o LexVerilog.o \ -LexVHDL.o LexYAML.o -#--Autogenerated -- end of automatically generated section +LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../src/Lex*.cxx)))) + BASEOBJS = \ AutoComplete.o \ |