diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-05-27 18:38:14 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-09-21 19:58:56 +0900 |
| commit | af121719c99a99fc3444d181777a6177f0d59dba (patch) | |
| tree | 786cf8548c92daf560733278701d95d3079b1d2f /kernel/ksquirrel-libs-png | |
| parent | 5b8d2d73599f1a06c2106ef71b9774dada86e076 (diff) | |
| download | libksquirrel-af121719c99a99fc3444d181777a6177f0d59dba.tar.gz libksquirrel-af121719c99a99fc3444d181777a6177f0d59dba.zip | |
Conversion to cmake building system
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kernel/ksquirrel-libs-png')
| -rw-r--r-- | kernel/ksquirrel-libs-png/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | kernel/ksquirrel-libs-png/Makefile.am | 2 | ||||
| -rw-r--r-- | kernel/ksquirrel-libs-png/pngconf.h | 4 |
3 files changed, 23 insertions, 2 deletions
diff --git a/kernel/ksquirrel-libs-png/CMakeLists.txt b/kernel/ksquirrel-libs-png/CMakeLists.txt new file mode 100644 index 0000000..d7ddcb4 --- /dev/null +++ b/kernel/ksquirrel-libs-png/CMakeLists.txt @@ -0,0 +1,19 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kernel/include + ${CMAKE_BINARY_DIR} +) + + +##### executable + +file( GLOB _bin_source_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/*.c + ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp +) +tde_add_library( ksquirrel-libs-png SHARED AUTOMOC + SOURCES ${_bin_source_files} + LINK ${ZLIB_LIBRARIES} ${MATH_LIBC} + VERSION 0.8.0 + DESTINATION ${LIB_INSTALL_DIR} +) diff --git a/kernel/ksquirrel-libs-png/Makefile.am b/kernel/ksquirrel-libs-png/Makefile.am index 084a02e..f00c7d9 100644 --- a/kernel/ksquirrel-libs-png/Makefile.am +++ b/kernel/ksquirrel-libs-png/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I. +INCLUDES = -I. -I../include $(all_includes) lib_LTLIBRARIES = libksquirrel-libs-png.la diff --git a/kernel/ksquirrel-libs-png/pngconf.h b/kernel/ksquirrel-libs-png/pngconf.h index cfd61bf..b766375 100644 --- a/kernel/ksquirrel-libs-png/pngconf.h +++ b/kernel/ksquirrel-libs-png/pngconf.h @@ -17,6 +17,8 @@ #ifndef PNGCONF_H #define PNGCONF_H +#include "ksquirrel-libs/ksquirrel_libs_export.h" + #define PNG_1_2_X /* @@ -1378,7 +1380,7 @@ typedef z_stream FAR * png_zstreamp; #endif #ifndef PNG_EXPORT -# define PNG_EXPORT(type,symbol) PNG_IMPEXP type PNGAPI symbol +# define PNG_EXPORT(type,symbol) LIBKSQUIRREL_EXPORT PNG_IMPEXP type PNGAPI symbol #endif #ifdef PNG_USE_GLOBAL_ARRAYS |