mirror of
https://github.com/notepad-plus-plus/notepad-plus-plus.git
synced 2025-10-26 17:13:53 +01:00
a61b03ea88
Update with https://www.scintilla.org/scintilla521.zip https://www.scintilla.org/lexilla515.zip - fix setting to bring Scintilla::PositionCR from ScintillaStructures.h inline with Sci_Position.h Sci_PositionCR - add workaround to enable lexer for searchResult commented out SCI_SETILEXER call on searchResult to get one result which is correctly handled by the lexer, added comment about the current problem with property @MarkingsStruct which seems to disappear after call to SCI_SETILEXER or CreateLexer - corrected usage of ObjC lexer - removed unnecessary filter stuff - use own sections for scintilla and lexilla build targets and allow parallel builds - as libscilex is no longer existing, changed to libscintilla - adapt makefiles and cmake - use VS2019 - started simple changes for createlexer adaptations, nullpointercheck missing on return of lexer name from deprecated LexerNameFromID -> undefined behaviour - movement from id -> lexer name, mostly done via LexerNameFromID + switching off corresponding compiler warning - changed to SCI_SETILEXER from SCI_SETLEXER, SCI_SETLEXERLANGUAGE needs to be corrected, see Scintilla5Migration.html - just commented out: SCI_LOADLEXERLIBRARY Fix #10504, close #11419
39 lines
906 B
Makefile
39 lines
906 B
Makefile
.PHONY: all check clean
|
|
|
|
INCLUDES = -I ../../../scintilla/include -I ../../include -I ../../lexlib
|
|
|
|
BASE_FLAGS += --std=c++17 -shared
|
|
|
|
ifdef windir
|
|
SHAREDEXTENSION = dll
|
|
else
|
|
ifeq ($(shell uname),Darwin)
|
|
SHAREDEXTENSION = dylib
|
|
BASE_FLAGS += -dynamiclib -arch arm64 -arch x86_64
|
|
else
|
|
BASE_FLAGS += -fPIC
|
|
SHAREDEXTENSION = so
|
|
endif
|
|
BASE_FLAGS += -fvisibility=hidden
|
|
endif
|
|
|
|
ifdef windir
|
|
RM = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q)
|
|
CXX = g++
|
|
endif
|
|
|
|
LIBRARY = SimpleLexer.$(SHAREDEXTENSION)
|
|
LEXLIB = ../../lexlib/*.cxx
|
|
|
|
all: $(LIBRARY)
|
|
|
|
# make check requires CheckLexilla to have already been built
|
|
check: $(LIBRARY)
|
|
../CheckLexilla/CheckLexilla ./$(LIBRARY)
|
|
|
|
clean:
|
|
$(RM) *.o *obj *.lib *.exp $(LIBRARY)
|
|
|
|
$(LIBRARY): *.cxx
|
|
$(CXX) $(INCLUDES) $(BASE_FLAGS) $(CPPFLAGS) $(CXXFLAGS) $^ $(LEXLIB) $(LIBS) $(LDLIBS) -o $@
|