From fdb6d781a14befca446ddb99e78fbb582ef26f77 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sun, 17 May 2020 11:39:57 +1000
Subject: On Unix call shared object liblexilla instead of lexilla to match
 platform convention.

---
 lexilla/src/README   | 2 +-
 lexilla/src/makefile | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'lexilla/src')

diff --git a/lexilla/src/README b/lexilla/src/README
index aec65a08d..d65790afd 100644
--- a/lexilla/src/README
+++ b/lexilla/src/README
@@ -5,7 +5,7 @@ programming, mark-up, and data languages for the Scintilla source code editing
 component.
 
 Lexilla is made available as both a shared library and static library.
-The shared library is called lexilla.so / lexilla.dylib / lexilla.dll on Linux / macOS /
+The shared library is called liblexilla.so / liblexilla.dylib / lexilla.dll on Linux / macOS /
 Windows.
 The static library is called liblexilla.a when built with GCC or Clang and liblexilla.lib
 when built with MSVC.
diff --git a/lexilla/src/makefile b/lexilla/src/makefile
index 4560a6d14..123d16e6d 100644
--- a/lexilla/src/makefile
+++ b/lexilla/src/makefile
@@ -19,10 +19,12 @@ DIR_BIN=../../bin
 WARNINGS = -Wpedantic -Wall -Wextra
 
 ifdef windir
+    SHARED_NAME = lexilla
     SHAREDEXTENSION = dll
     WINDRES ?= windres
     VERSION_RESOURCE = LexillaVersion.o
 else
+    SHARED_NAME = liblexilla
     ifeq ($(shell uname),Darwin)
         CLANG := 1
         LDFLAGS += -dynamiclib
@@ -33,7 +35,7 @@ else
     BASE_FLAGS += -fvisibility=hidden
 endif
 
-LEXILLA=$(DIR_BIN)/lexilla.$(SHAREDEXTENSION)
+LEXILLA=$(DIR_BIN)/$(SHARED_NAME).$(SHAREDEXTENSION)
 LIBLEXILLA=$(DIR_BIN)/liblexilla.a
 
 BASE_FLAGS += --std=c++17
-- 
cgit v1.2.3