From b65e62d86dd1d7f054dd6604d76dac1660d66027 Mon Sep 17 00:00:00 2001
From: David Macek <david.macek.0@gmail.com>
Date: Thu, 12 Feb 2015 13:03:03 +0100
Subject: [PATCH 2/3] Prefix library names

---
 scintilla/gtk/makefile   | 4 ++--
 scintilla/win32/makefile | 4 ++--
 scite/win32/SciTEWin.cxx | 2 +-
 scite/win32/makefile     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scintilla/gtk/makefile b/scintilla/gtk/makefile
index 0d4397e..026f358 100644
--- a/scintilla/gtk/makefile
+++ b/scintilla/gtk/makefile
@@ -63,12 +63,12 @@
 ifdef windir
 CC = gcc
 DEL = rm -f
-LEXILLA = lexilla.dll
+LEXILLA = liblexilla.dll
 else
 DEL = rm -f
 LEXILLA = liblexilla.so
 endif
-COMPLIB=$(basedir)/bin/scintilla.a
+COMPLIB=$(basedir)/bin/libScintillaGtk.a
 COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
 
 vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib
@@ -185,7 +185,7 @@
 	$(RANLIB) $@
 
 $(COMPONENT): $(SRC_OBJS) $(LEXLIBS_OBJS) $(GTK_OBJS) $(MARSHALLER)
-	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(CONFIGLIB)
+	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,--out-implib,$(COMPONENT).a $^ -o $@ $(CONFIGLIB)
 
 Catalogue.o: Catalogue.cxx
 	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -D SCI_EMPTYCATALOGUE -c $< -o $@
diff --git a/scintilla/lexilla/src/makefile b/scintilla/lexilla/src/makefile
index 22959cb..16c21a8 100644
--- a/scintilla/lexilla/src/makefile
+++ b/scintilla/lexilla/src/makefile
@@ -19,7 +19,7 @@
 WARNINGS = -Wpedantic -Wall -Wextra
 
 ifdef windir
-    SHARED_NAME = lexilla
+    SHARED_NAME = liblexilla
     SHAREDEXTENSION = dll
     WINDRES ?= windres
     VERSION_RESOURCE = LexillaVersion.o
@@ -119,7 +120,7 @@
 	$(LEXERS:.cxx=.o)
 
 $(LEXILLA): $(LEXILLA_OBJS) $(VERSION_RESOURCE)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS)  -Wl,--out-implib,$(LEXILLA).a $^ -o $@
 
 $(LIBLEXILLA):  $(LEXILLA_OBJS)
 	$(AR) rc $@ $^
diff --git a/scintilla/win32/makefile b/scintilla/win32/makefile
index 806e585..7550b4a 100644
--- a/scintilla/win32/makefile
+++ b/scintilla/win32/makefile
@@ -11,8 +11,8 @@
 
 DIR_BIN=../bin
 
-COMPONENT = $(DIR_BIN)/Scintilla.dll
-LEXCOMPONENT = $(DIR_BIN)/SciLexer.dll
+COMPONENT = $(DIR_BIN)/libScintilla.dll
+LEXCOMPONENT = $(DIR_BIN)/libSciLexer.dll
 LIBSCI = $(DIR_BIN)/libscintilla.a
 
 WARNINGS = -Wpedantic -Wall
@@ -158,10 +158,10 @@
 	ScintRes.o
 
 $(COMPONENT): $(COMPONENT_OBJS)
-	$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $^ $(CXXFLAGS) $(LIBS)
+	$(CXX) $(LDFLAGS) -Wl,-out-implib,$(COMPONENT).a -o $@ $(STRIPFLAG) $^ $(CXXFLAGS) $(LIBS)
 
 $(LEXCOMPONENT): $(LEXCOMPONENT_OBJS)
-	$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $^ $(CXXFLAGS) $(LIBS)
+	$(CXX) $(LDFLAGS) -Wl,-out-implib,$(LEXCOMPONENT).a -o $@ $(STRIPFLAG) $^ $(CXXFLAGS) $(LIBS)
 
 $(LIBSCI): $(COMPONENT_OBJS)
 	$(AR) $(ARFLAGS) $@ $^
diff --git a/scite/win32/SciTEWin.cxx b/scite/win32/SciTEWin.cxx
index 22959cb..16c21a8 100644
--- a/scite/win32/SciTEWin.cxx
+++ b/scite/win32/SciTEWin.cxx
@@ -32,9 +32,9 @@
 #else
 const GUI::gui_char appName[] = GUI_TEXT("SciTE");
 #ifdef LOAD_SCINTILLA
-static const GUI::gui_char scintillaName[] = GUI_TEXT("Scintilla.DLL");
+static const GUI::gui_char scintillaName[] = GUI_TEXT("libScintilla.DLL");
 #else
-static const GUI::gui_char scintillaName[] = GUI_TEXT("SciLexer.DLL");
+static const GUI::gui_char scintillaName[] = GUI_TEXT("libSciLexer.DLL");
 #endif
 #endif
 
diff --git a/scite/win32/makefile b/scite/win32/makefile
index e5ccb62..5125190 100644
--- a/scite/win32/makefile
+++ b/scite/win32/makefile
@@ -149,7 +149,7 @@
 
 OBJS = Credits.o $(OTHER_OBJS)
 
-DLLS=../bin/Scintilla.dll ../bin/SciLexer.dll ../bin/lexilla.dll
+DLLS=../bin/libScintilla.dll ../bin/libSciLexer.dll ../bin/liblexilla.dll
 
 NOTBINPROPS=SciTE.properties Embedded.properties
 PROPS=$(addprefix ../bin/,$(filter-out $(NOTBINPROPS), $(notdir $(wildcard ../src/*.properties))))
-- 
2.3.0

