Mercurial > molko
changeset 561:7732e789bcdd
rpg: conditionally enable fmemopen functions
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Wed, 08 Mar 2023 21:03:00 +0100 |
| parents | ecb158cbdd67 |
| children | 07e3989609fd |
| files | doc/Doxyfile libmlk-rpg/mlk/rpg/map-loader.c libmlk-rpg/mlk/rpg/map-loader.h libmlk-rpg/mlk/rpg/tileset-loader.c libmlk-rpg/mlk/rpg/tileset-loader.h libmlk-util/CMakeLists.txt |
| diffstat | 6 files changed, 27 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/Doxyfile Wed Mar 08 20:23:00 2023 +0100 +++ b/doc/Doxyfile Wed Mar 08 21:03:00 2023 +0100 @@ -35,7 +35,8 @@ libmlk-ui \ libmlk-rpg EXAMPLE_PATH = examples -EXCLUDE = libmlk-core/mlk/core/sys_p.h \ +EXCLUDE = libmlk-util/mlk/util/sysconfig.cmake.h \ + libmlk-core/mlk/core/sys_p.h \ libmlk-core/mlk/core/texture_p.h \ libmlk-core/mlk/core/window_p.h \ libmlk-ui/mlk/ui/ui_p.h @@ -54,3 +55,4 @@ ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES +PREDEFINED = MLK_HAVE_FMEMOPEN
--- a/libmlk-rpg/mlk/rpg/map-loader.c Wed Mar 08 20:23:00 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/map-loader.c Wed Mar 08 21:03:00 2023 +0100 @@ -273,6 +273,8 @@ return parse(loader, map, fp); } +#if defined(MLK_HAVE_FMEMOPEN) + int mlk_map_loader_openmem(struct mlk_map_loader *loader, struct mlk_map *map, const void *data, size_t datasz) { @@ -289,3 +291,5 @@ return parse(loader, map, fp); } + +#endif
--- a/libmlk-rpg/mlk/rpg/map-loader.h Wed Mar 08 20:23:00 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/map-loader.h Wed Mar 08 21:03:00 2023 +0100 @@ -19,6 +19,8 @@ #ifndef MLK_RPG_MAP_LOADER_H #define MLK_RPG_MAP_LOADER_H +#include <mlk/util/sysconfig.h> + #include <stddef.h> enum mlk_map_layer_type; @@ -130,6 +132,8 @@ struct mlk_map *map, const char *path); +#if defined(MLK_HAVE_FMEMOPEN) + /** * Try to open a map from the given path. * @@ -140,6 +144,7 @@ * \param data the map content * \param datasz the map content length * \return 0 on success or -1 on error + * \note This function is available only if MLK_HAVE_FMEMOPEN is defined. */ int mlk_map_loader_openmem(struct mlk_map_loader *loader, @@ -147,6 +152,8 @@ const void *data, size_t datasz); +#endif + #if defined(__cplusplus) } #endif
--- a/libmlk-rpg/mlk/rpg/tileset-loader.c Wed Mar 08 20:23:00 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/tileset-loader.c Wed Mar 08 21:03:00 2023 +0100 @@ -297,6 +297,8 @@ return parse(loader, tileset, fp); } +#if defined(MLK_HAVE_FMEMOPEN) + int mlk_tileset_loader_openmem(struct mlk_tileset_loader *loader, struct mlk_tileset *tileset, @@ -316,3 +318,5 @@ return parse(loader, tileset, fp); } + +#endif
--- a/libmlk-rpg/mlk/rpg/tileset-loader.h Wed Mar 08 20:23:00 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/tileset-loader.h Wed Mar 08 21:03:00 2023 +0100 @@ -34,6 +34,8 @@ * See tileset-file.h for an implementation of this module using files. */ +#include <mlk/util/sysconfig.h> + #include <stddef.h> struct mlk_animation; @@ -145,6 +147,8 @@ struct mlk_tileset *tileset, const char *path); +#if defined(MLK_HAVE_FMEMOPEN) + /** * Open a tileset from a const binary data. * @@ -159,6 +163,7 @@ * \param data the tileset content * \param datasz the tileset content length * \return 0 on success or an error code on failure + * \note This function is available only if MLK_HAVE_FMEMOPEN is defined. */ int mlk_tileset_loader_openmem(struct mlk_tileset_loader *loader, @@ -166,6 +171,8 @@ const void *data, size_t datasz); +#endif + #if defined(__cplusplus) } #endif
--- a/libmlk-util/CMakeLists.txt Wed Mar 08 20:23:00 2023 +0100 +++ b/libmlk-util/CMakeLists.txt Wed Mar 08 21:03:00 2023 +0100 @@ -47,7 +47,7 @@ configure_file( ${libmlk-util_SOURCE_DIR}/mlk/util/sysconfig.cmake.h - ${libmlk-util_BINARY_DIR}/sysconfig.h + ${libmlk-util_BINARY_DIR}/mlk/util/sysconfig.h ) mlk_library( @@ -59,6 +59,7 @@ PUBLIC $<BUILD_INTERFACE:${libmlk-util_SOURCE_DIR}> $<BUILD_INTERFACE:${libmlk-util_BINARY_DIR}> + $<BUILD_INTERFACE:${libmlk-util_BINARY_DIR}/mlk/util> ) source_group(TREE ${libmlk-util_SOURCE_DIR} FILES ${SOURCES})