diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2017-04-07 18:10:12 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2017-04-07 18:10:12 -0400 |
| commit | d255bd6711955192f98bed8bf0b98872dab7fca6 (patch) | |
| tree | ad4d14573ece5e8117c9de7ae246ecf711f70680 /src/Makefile | |
| parent | ea8dd79d8972d8a0e23d1be50cf26e3c2ccadda7 (diff) | |
| download | textadept-d255bd6711955192f98bed8bf0b98872dab7fca6.tar.gz textadept-d255bd6711955192f98bed8bf0b98872dab7fca6.zip | |
Effectively updated to Scintilla 3.7.4 with select backports to 3.7.3.
Scintilla 3.7.4 requires a C++11 compiler, which I do not have.
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index fa5f3e16..f0c7fc36 100644 --- a/src/Makefile +++ b/src/Makefile @@ -425,10 +425,15 @@ bombay_zip = bombay.zip cloc = cloc-1.60.pl $(scintilla_tgz): ; wget http://prdownloads.sourceforge.net/scintilla/$@ -O $@ -scintilla: scintilla.patch | $(scintilla_tgz) - if [ -d $@ ]; then rm -r $@; fi - mkdir $@ && tar xzf $| -C $@ && mv $@/*/* $@ - patch -d $@ -N -p1 < $< +scintilla: $(wildcard scintilla_backports/*.patch) scintilla.patch | \ + $(scintilla_tgz) + if [ -d $@/.hg ]; then \ + hg --cwd $@ update -C -r rel-3-7-3; \ + else \ + if [ -d $@ ]; then rm -r $@; fi; \ + mkdir $@ && tar xzf $| -C $@ && mv $@/*/* $@; \ + fi + for patch in $^; do echo Applying $$patch; patch -d $@ -N -p1 < $$patch; done $(tre_zip): ; wget https://github.com/laurikari/tre/archive/$@ -O $@ tre: tre.patch | $(tre_zip) if [ -d $@ ]; then rm -r $@; fi |