aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk/makefile11
-rw-r--r--src/LexPascal.cxx1
-rw-r--r--win32/makefile9
-rw-r--r--win32/scintilla.mak17
4 files changed, 25 insertions, 13 deletions
diff --git a/gtk/makefile b/gtk/makefile
index 5389fe063..1fa3a24a1 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -15,7 +15,7 @@ vpath %.cxx ../src
#CXXFLAGS= -g -DGTK -DSCI_LEXER -Wwrite-strings
INCLUDEDIRS=-I ../include -I ../src
-XIMFLAGS= -DUSE_XIM
+XIMFLAGS= -DUSE_XIM
CXXBASEFLAGS= -DGTK -DSCI_LEXER -W -Wall $(XIMFLAGS)
ifdef DEBUG
@@ -27,7 +27,8 @@ endif
.cxx.o:
$(CC) `gtk-config --cflags` $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@
-LEXOBJS = LexCPP.o LexHTML.o LexLua.o LexOthers.o LexPerl.o LexPython.o LexSQL.o LexVB.o LexConf.o
+LEXOBJS = LexConf.o LexCPP.o LexHTML.o LexLua.o LexOthers.o LexPascal.o \
+ LexPerl.o LexPython.o LexSQL.o LexVB.o
# The LEXOBJS have to be treated specially as the functions in them are not called from external code
@@ -56,6 +57,8 @@ Indicator.o: Indicator.cxx Platform.h Scintilla.h WinDefs.h \
KeyMap.o: KeyMap.cxx Platform.h Scintilla.h WinDefs.h KeyMap.h
KeyWords.o: KeyWords.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h WinDefs.h SciLexer.h
+LexConf.o: LexConf.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
+ Scintilla.h WinDefs.h SciLexer.h
LexCPP.o: LexCPP.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h WinDefs.h SciLexer.h
LexHTML.o: LexHTML.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
@@ -64,6 +67,8 @@ LexLua.o: LexLua.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h WinDefs.h SciLexer.h
LexOthers.o: LexOthers.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h WinDefs.h SciLexer.h
+LexPascal.o: LexPascal.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
+ Scintilla.h WinDefs.h SciLexer.h
LexPerl.o: LexPerl.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h WinDefs.h SciLexer.h
LexPython.o: LexPython.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
@@ -72,8 +77,6 @@ LexSQL.o: LexSQL.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h WinDefs.h SciLexer.h
LexVB.o: LexVB.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h WinDefs.h SciLexer.h
-LexConf.o: LexConf.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
- Scintilla.h WinDefs.h SciLexer.h
LineMarker.o: LineMarker.cxx Platform.h Scintilla.h WinDefs.h \
LineMarker.h
PlatGTK.o: PlatGTK.cxx Platform.h Scintilla.h ScintillaWidget.h WinDefs.h
diff --git a/src/LexPascal.cxx b/src/LexPascal.cxx
index b9aed807b..d9227df99 100644
--- a/src/LexPascal.cxx
+++ b/src/LexPascal.cxx
@@ -48,7 +48,6 @@ static void ColourisePascalDoc(unsigned int startPos, int length, int initStyle,
styler.StartAt(startPos);
bool fold = styler.GetPropertyInt("fold");
- bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor");
int lineCurrent = styler.GetLine(startPos);
int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
int levelCurrent = levelPrev;
diff --git a/win32/makefile b/win32/makefile
index 100636202..c3a0e3435 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -34,7 +34,8 @@ ALL: $(COMPONENT) $(LEXCOMPONENT) ScintillaWinS.o WindowAccessor.o
clean:
del /q *.exe *.o *.obj *.dll *.res *.map
-LEXOBJS = LexCPP.o LexHTML.o LexLua.o LexOthers.o LexPerl.o LexPython.o LexSQL.o LexVB.o LexConf.o
+LEXOBJS = LexConf.o LexCPP.o LexHTML.o LexLua.o LexOthers.o LexPascal.o \
+ LexPerl.o LexPython.o LexSQL.o LexVB.o
SOBJS = ScintillaWin.o ScintillaBase.o Editor.o Document.o \
ContractionState.o CellBuffer.o CallTip.o \
@@ -62,6 +63,8 @@ Editor.o: Editor.cxx Platform.h Scintilla.h ContractionState.h \
Document.h Editor.h
Indicator.o: Indicator.cxx Platform.h Scintilla.h Indicator.h
KeyMap.o: KeyMap.cxx Platform.h Scintilla.h KeyMap.h
+LexConf.o: LexConf.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
+ Scintilla.h SciLexer.h
LexCPP.o: LexCPP.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h SciLexer.h
LexHTML.o: LexHTML.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
@@ -70,6 +73,8 @@ LexLua.o: LexLua.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h SciLexer.h
LexOthers.o: LexOthers.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h SciLexer.h
+LexPascal.o: LexPascal.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
+ Scintilla.h SciLexer.h
LexPerl.o: LexPerl.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h SciLexer.h
LexPython.o: LexPython.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
@@ -78,8 +83,6 @@ LexSQL.o: LexSQL.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h SciLexer.h
LexVB.o: LexVB.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h SciLexer.h
-LexConf.o: LexConf.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
- Scintilla.h SciLexer.h
KeyWords.o: KeyWords.cxx Platform.h PropSet.h Accessor.h KeyWords.h \
Scintilla.h SciLexer.h
LineMarker.o: LineMarker.cxx Platform.h Scintilla.h LineMarker.h
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 2109113c3..924919a6c 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -102,15 +102,16 @@ SOBJS=\
$(DIR_O)\ViewStyle.obj
LEXOBJS=\
+ $(DIR_O)\LexConf.obj \
$(DIR_O)\LexCPP.obj \
$(DIR_O)\LexHTML.obj \
$(DIR_O)\LexLua.obj \
$(DIR_O)\LexOthers.obj \
+ $(DIR_O)\LexPascal.obj \
$(DIR_O)\LexPerl.obj \
$(DIR_O)\LexPython.obj \
$(DIR_O)\LexSQL.obj \
- $(DIR_O)\LexVB.obj \
- $(DIR_O)\LexConf.obj
+ $(DIR_O)\LexVB.obj
LOBJS=\
$(DIR_O)\AutoComplete.obj \
@@ -200,6 +201,12 @@ $(DIR_O)\KeyMap.obj: ..\src\KeyMap.cxx ..\include\Platform.h ..\include\Scintill
$(DIR_O)\KeyWords.obj: ..\src\KeyWords.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
..\include\Scintilla.h ..\include\SciLexer.h
+$(DIR_O)\LexCPP.obj: ..\src\LexCPP.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
+ ..\include\Scintilla.h ..\include\SciLexer.h
+
+$(DIR_O)\LexConf.obj: ..\src\LexConf.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
+ ..\include\Scintilla.h ..\include\SciLexer.h
+
$(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
..\include\Scintilla.h ..\include\SciLexer.h
@@ -212,6 +219,9 @@ $(DIR_O)\LexOthers.obj: ..\src\LexOthers.cxx ..\include\Platform.h ..\include\Pr
$(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
..\include\Scintilla.h ..\include\SciLexer.h
+$(DIR_O)\LexPascal.obj: ..\src\LexPascal.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
+ ..\include\Scintilla.h ..\include\SciLexer.h
+
$(DIR_O)\LexPython.obj: ..\src\LexPython.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
..\include\Scintilla.h ..\include\SciLexer.h
@@ -221,9 +231,6 @@ $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx ..\include\Platform.h ..\include\PropSet.
$(DIR_O)\LexVB.obj: ..\src\LexVB.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
..\include\Scintilla.h ..\include\SciLexer.h
-$(DIR_O)\LexConf.obj: ..\src\LexConf.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h
-
$(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
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 17:45:56 +0000