diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-05-17 11:39:57 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-05-17 11:39:57 +1000 |
| commit | fdb6d781a14befca446ddb99e78fbb582ef26f77 (patch) | |
| tree | 24f007c1e0a2f5500926728dba5defb5cdb46158 | |
| parent | a2360c37c6374007ba2d6ce937862ce357485fec (diff) | |
| download | scintilla-mirror-fdb6d781a14befca446ddb99e78fbb582ef26f77.tar.gz | |
On Unix call shared object liblexilla instead of lexilla to match platform
convention.
| -rw-r--r-- | lexilla/src/README | 2 | ||||
| -rw-r--r-- | lexilla/src/makefile | 4 | ||||
| -rw-r--r-- | lexilla/test/LexillaAccess.cxx | 4 |
3 files changed, 6 insertions, 4 deletions
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 diff --git a/lexilla/test/LexillaAccess.cxx b/lexilla/test/LexillaAccess.cxx index ea62c9605..10e7675db 100644 --- a/lexilla/test/LexillaAccess.cxx +++ b/lexilla/test/LexillaAccess.cxx @@ -77,9 +77,9 @@ bool LoadLexilla([[maybe_unused]] std::filesystem::path path) { lexillaDL = ::LoadLibraryW(sharedLibrary.c_str()); #else #if defined(__APPLE__) - sharedLibrary.append("lexilla.dylib"); + sharedLibrary.append("liblexilla.dylib"); #else - sharedLibrary.append("lexilla.so"); + sharedLibrary.append("liblexilla.so"); #endif lexillaDL = dlopen(sharedLibrary.c_str(), RTLD_LAZY); #endif |