From ab009fae9436bb41723a5a34d3fcb5b5b3aa708a Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 31 Mar 2019 20:05:41 +0200 Subject: [PATCH] Remove macro WINDLLNAME It is now no longer used. Signed-off-by: Stefan Weil --- CMakeLists.txt | 1 - cppan.yml | 1 - src/ccutil/Makefile.am | 4 ---- sw.cpp | 1 - 4 files changed, 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d83480094..7b6df91989 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,7 +214,6 @@ include(BuildFunctions) include(SourceGroups) add_definitions(-D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1) -add_definitions(-DWINDLLNAME="libtesseract${VERSION_MAJOR}${VERSION_MINOR}.dll") include_directories(${Leptonica_INCLUDE_DIRS}) diff --git a/cppan.yml b/cppan.yml index fa82c1cf2a..2670b0fbd2 100644 --- a/cppan.yml +++ b/cppan.yml @@ -144,7 +144,6 @@ projects: - HAVE_CONFIG_H - HAVE_LIBARCHIVE - _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1 - - WINDLLNAME="tesseract" shared: definitions: private: diff --git a/src/ccutil/Makefile.am b/src/ccutil/Makefile.am index 692fd33095..8bc16bd3ad 100644 --- a/src/ccutil/Makefile.am +++ b/src/ccutil/Makefile.am @@ -41,7 +41,3 @@ libtesseract_ccutil_la_SOURCES = \ params.cpp universalambigs.cpp AM_CPPFLAGS += $(libarchive_CFLAGS) - -if T_WIN -AM_CPPFLAGS += -DWINDLLNAME=\"lib@GENERIC_LIBRARY_NAME@\" -endif diff --git a/sw.cpp b/sw.cpp index 816e718f42..7be3fdab4a 100644 --- a/sw.cpp +++ b/sw.cpp @@ -69,7 +69,6 @@ void build(Solution &s) } libtesseract.Public += "HAVE_CONFIG_H"_d; - libtesseract.Public += "WINDLLNAME=\"tesseract\""_d; libtesseract.Public += "_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1"_d; libtesseract.Public += "HAVE_LIBARCHIVE"_d; libtesseract.Interface += sw::Shared, "TESS_IMPORTS"_d;