aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc/ScintillaHistory.html5
-rw-r--r--gtk/makefile2
-rw-r--r--win32/makefile2
3 files changed, 7 insertions, 2 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 0507227cd..fd6648a55 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -509,6 +509,7 @@
</tr><tr>
<td>John Flatness</td>
<td>Thorsten Kani</td>
+ <td>Bernhard M. Wiedemann</td>
</tr>
</table>
<p>
@@ -579,6 +580,10 @@
<a href="http://sourceforge.net/p/scintilla/bugs/1940/">Bug #1940</a>.
</li>
<li>
+ Builds are made with a sorted list of lexers to be more reproducible.
+ <a href="http://sourceforge.net/p/scintilla/bugs/1946/">Bug #1946</a>.
+ </li>
+ <li>
On Cocoa, a leak of mouse tracking areas was fixed.
</li>
<li>
diff --git a/gtk/makefile b/gtk/makefile
index 5a4fa8231..a28aa092d 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -96,7 +96,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
.list.c:
$(GLIB_GENMARSHAL) --body $(GLIB_GENMARSHAL_FLAGS) $< > $@
-LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx))))
+LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))))
all: $(COMPLIB)
diff --git a/win32/makefile b/win32/makefile
index 22819c4f0..1af28c03f 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -70,7 +70,7 @@ analyze:
deps:
$(CXX) -MM $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx >deps.mak
-LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
+LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard ../lexers/Lex*.cxx)))))
BASEOBJS = \