Timerix/utf8proc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Static library support improvements (#123)

Browse Source 
* `#define UTF8PROC_STATIC` to disable DLLEXPORT

`#define UTF8PROC_STATIC` to disable DLLEXPORT

* [CMake] Automatically define UTF8PROC_STATIC if BUILD_SHARED_LIBS is off

* [Makefile] Support additional UTF8PROC_DEFINES, which can be used to specify flags like `-DUTF8PROC_STATIC`
This commit is contained in:
past-due 2018-04-29 21:37:12 -04:00 committed by Steven G. Johnson
parent fe3f6bda11
commit 48949bd3eb
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -22,6 +22,13 @@ add_library (utf8proc
utf8proc.h utf8proc.h
) )
if (BUILD_SHARED_LIBS)
# Building shared library
else()
# Building static library
target_compile_definitions(utf8proc PUBLIC "UTF8PROC_STATIC")
endif()
target_compile_definitions(utf8proc PRIVATE "UTF8PROC_EXPORTS") target_compile_definitions(utf8proc PRIVATE "UTF8PROC_EXPORTS")
set_target_properties (utf8proc PROPERTIES set_target_properties (utf8proc PROPERTIES

2
Makefile
View File

@ -11,7 +11,7 @@ CFLAGS ?= -O2
PICFLAG = -fPIC PICFLAG = -fPIC
C99FLAG = -std=c99 C99FLAG = -std=c99
WCFLAGS = -Wall -pedantic WCFLAGS = -Wall -pedantic
UCFLAGS = $(CFLAGS) $(PICFLAG) $(C99FLAG) $(WCFLAGS) -DUTF8PROC_EXPORTS UCFLAGS = $(CFLAGS) $(PICFLAG) $(C99FLAG) $(WCFLAGS) -DUTF8PROC_EXPORTS $(UTF8PROC_DEFINES)
# shared-library version MAJOR.MINOR.PATCH ... this may be *different* # shared-library version MAJOR.MINOR.PATCH ... this may be *different*
# from the utf8proc version number because it indicates ABI compatibility, # from the utf8proc version number because it indicates ABI compatibility,

10
utf8proc.h
View File

@ -120,16 +120,20 @@ typedef bool utf8proc_bool;
#endif #endif
#include <limits.h> #include <limits.h>
#ifdef _WIN32 #ifdef UTF8PROC_STATIC
# define UTF8PROC_DLLEXPORT
#else
# ifdef _WIN32
# ifdef UTF8PROC_EXPORTS # ifdef UTF8PROC_EXPORTS
# define UTF8PROC_DLLEXPORT __declspec(dllexport) # define UTF8PROC_DLLEXPORT __declspec(dllexport)
# else # else
# define UTF8PROC_DLLEXPORT __declspec(dllimport) # define UTF8PROC_DLLEXPORT __declspec(dllimport)
# endif # endif
#elif __GNUC__ >= 4 # elif __GNUC__ >= 4
# define UTF8PROC_DLLEXPORT __attribute__ ((visibility("default"))) # define UTF8PROC_DLLEXPORT __attribute__ ((visibility("default")))
#else # else
# define UTF8PROC_DLLEXPORT # define UTF8PROC_DLLEXPORT
# endif
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus