diff --git a/.gitmodules b/.gitmodules index 7d4d7e80..dd857360 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "dep/scintilla/lexilla"] path = dep/scintilla/lexilla url = git@github.com:ScintillaOrg/lexilla.git +[submodule "dep/scintilla/scintillua"] + path = dep/scintilla/scintillua + url = https://github.com/orbitalquark/scintillua.git diff --git a/dep/scintilla/CMakeLists.txt b/dep/scintilla/CMakeLists.txt index 0693612a..886a2fd2 100644 --- a/dep/scintilla/CMakeLists.txt +++ b/dep/scintilla/CMakeLists.txt @@ -67,6 +67,4 @@ target_link_libraries(scintilla set_target_properties(scintilla PROPERTIES AUTOMOC ON) -set(SCINTILLUA_LEXERS_DIR - ${SCINTILLA_DIR}/lexlua - CACHE INTERNAL "") +set(SCINTILLUA_LEXERS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/scintillua/lexers CACHE INTERNAL "") diff --git a/dep/scintilla/Readme.md b/dep/scintilla/Readme.md index 7a0854d0..9c3d9c72 100644 --- a/dep/scintilla/Readme.md +++ b/dep/scintilla/Readme.md @@ -1,3 +1,3 @@ To update to a new version, download the source from https://www.scintilla.org/ScintillaHistory.html -and replace it with the current +and replace it with the current diff --git a/dep/scintilla/scintillua b/dep/scintilla/scintillua new file mode 160000 index 00000000..33d0e343 --- /dev/null +++ b/dep/scintilla/scintillua @@ -0,0 +1 @@ +Subproject commit 33d0e3433a2046c1077f6b33fc801caf6bfac7a9