diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-07-05 20:41:05 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-07-05 20:41:05 +0200 |
| commit | 46599080236debda27263ea05d9293069e9ddb4f (patch) | |
| tree | 6667b2a41dbae12d20ff2078f35e36099d85a869 | |
| parent | c5c24b0edbf10e236d9c0ef519f6711fc4a526a8 (diff) | |
| download | sciteco-46599080236debda27263ea05d9293069e9ddb4f.tar.gz | |
fixed INSTALL instructions and added patch for Scintilla v3.3.1 compatibility
| -rw-r--r-- | INSTALL | 7 | ||||
| -rw-r--r-- | patches/040-scinterm-compat.patch | 13 |
2 files changed, 17 insertions, 3 deletions
@@ -16,7 +16,7 @@ SciTECO Build and Runtime Dependencies * Autotools, GNU C/C++ (v4.4 or later) or LLVM/gcc or LLVM/Clang * Glib 2 as a cross-platform runtime library: https://launchpad.net/~robin-haberkorn/+archive/sciteco - * Scintilla (v3.2.3 or later): + * Scintilla (v3.2.3 up to v3.3.1): http://www.scintilla.org/ * Curses interface: * Scinterm (v1.1 or later): @@ -83,11 +83,12 @@ from a source bundle: * Install Scintilla/Scinterm according to their READMEs. Usually you unpack Scinterm into a subdirectory of Scintilla and run make... - * Apply the patches contained in the SciTECO sources: patches/*.patch + * But before that, apply the patches contained in the SciTECO + sources: patches/*.patch For instance: # cd ~/scintilla # for patch in SCITECO_PATH/patches/*.patch; do - > patch --merge -p1 <$patch + > patch --merge -p2 <$patch > done * Build SciTECO just like described above. If you did not use the same directory layout as the source bundles diff --git a/patches/040-scinterm-compat.patch b/patches/040-scinterm-compat.patch new file mode 100644 index 0000000..30e21a8 --- /dev/null +++ b/patches/040-scinterm-compat.patch @@ -0,0 +1,13 @@ +Necessary for Scintilla 3.3.1 compatibility +(already fixed in Scinterm repository) +--- a/scintilla/scinterm/Makefile 2013-07-05 19:59:35.094018253 +0200 ++++ b/scintilla/scinterm/Makefile 2013-07-05 19:59:45.102018598 +0200 +@@ -5,7 +5,7 @@ + CXX = g++ + INCLUDEDIRS = -I ../include -I ../src -I ../lexlib + CXXFLAGS = -Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long \ +- -pedantic -DNCURSES -DSCI_LEXER $(INCLUDEDIRS) ++ -pedantic -DNCURSES -DCURSES -DSCI_LEXER $(INCLUDEDIRS) + ifdef DEBUG + CXXFLAGS += -DDEBUG -g + else |