diff options
author | Luigi Scarso <luigi.scarso@gmail.com> | 2020-04-24 18:47:01 +0000 |
---|---|---|
committer | Luigi Scarso <luigi.scarso@gmail.com> | 2020-04-24 18:47:01 +0000 |
commit | af0b0a952d24678a758b9662e4979129dcd4a276 (patch) | |
tree | cf480a2cbcce012aee1ab758353cf94e27921492 /Build/source/libs/zziplib/zziplib-src/SDL | |
parent | b24c35be84a4e0ee848f0f5d9ef1193fb854f63c (diff) |
zziplib 0.13.71
git-svn-id: svn://tug.org/texlive/trunk@54860 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/zziplib/zziplib-src/SDL')
5 files changed, 77 insertions, 29 deletions
diff --git a/Build/source/libs/zziplib/zziplib-src/SDL/CMakeLists.txt b/Build/source/libs/zziplib/zziplib-src/SDL/CMakeLists.txt new file mode 100644 index 00000000000..7ceba4acdaa --- /dev/null +++ b/Build/source/libs/zziplib/zziplib-src/SDL/CMakeLists.txt @@ -0,0 +1,67 @@ +cmake_minimum_required (VERSION 3.1) +project(zzipsdl VERSION "0.13.71" LANGUAGES C) + +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +endif(NOT CMAKE_BUILD_TYPE) + +include ( GNUInstallDirs ) +include ( FindPkgConfig ) + +# options ######################################################## +option(BUILD_SHARED_LIBS "Build a shared library" ON) +option(BUILD_STATIC_LIBS "Build the static library" OFF) +option(BUILD_TESTS "Build test programs" OFF) +option(MSVC_STATIC_RUNTIME "Build with static runtime libs (/MT)" ON) + +# Zlib library needed +find_package ( ZLIB REQUIRED ) +# pkg_search_module ( ZZIP zzip ) +pkg_search_module ( SDL sdl2) + +# targets ######################################################## +set(ZZIPSDL_SRCS + SDL_rwops_zzip.c) + +set(ZZIPSDL_HDRS + SDL_rwops_zzip.h) + +set(ZZCATSDL_SRCS + ${ZZIPSDL_SRCS} + SDL_rwops_zzcat.c) + +if(SDL_FOUND) +add_executable(zzcatsdl ${ZZCATSDL_SRCS} ) +target_link_libraries(zzcatsdl libzzip "${SDL_LIBRARIES}" ZLIB::ZLIB) +target_include_directories(zzcatsdl PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" "${SDL_INCLUDE_DIRS}") +endif() + +# install ######################################################## +if(SDL_FOUND) +set(zzipsdldir "${CMAKE_INSTALL_INCLUDEDIR}/SDL_rwops_zzip") +install(FILES ${ZZIPSDL_SRCS} ${ZZIPSDL_HDRS} + DESTINATION ${zzipsdldir}) +endif() + +# pkgconfig ###################################################### + +if(SDL_FOUND) +if(UNIX) +join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") +join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") +add_custom_command(OUTPUT SDL_rwops_zzip.pc + COMMAND ${BASH} -c "echo 'prefix=${CMAKE_INSTALL_PREFIX}' > SDL_rwops_zzip.pc" + COMMAND ${BASH} -c "echo 'zzipsdldir=\${prefix}/${zzipsdldir}' >> SDL_rwops_zzip.pc" + COMMAND ${BASH} -c "echo '' >> SDL_rwops_zzip.pc" + COMMAND ${BASH} -c "echo 'Name: SDL_rwops_zzip' >> SDL_rwops_zzip.pc" + COMMAND ${BASH} -c "echo 'Version: ${PROJECT_VERSION}' >> SDL_rwops_zzip.pc" + COMMAND ${BASH} -c "echo 'Description: SDL_rwops for ZZipLib' >> SDL_rwops_zzip.pc" + COMMAND ${BASH} -c "echo 'Requires: sdl, zziplib' >> SDL_rwops_zzip.pc" + COMMAND ${BASH} -c "echo 'Cflags: -I\${zzipsdldir}' >> SDL_rwops_zzip.pc" + VERBATIM) +add_custom_target(pkgconfig-sdl ALL DEPENDS SDL_rwops_zzip.pc) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL_rwops_zzip.pc + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" ) +endif() +endif() diff --git a/Build/source/libs/zziplib/zziplib-src/SDL/Makefile.am b/Build/source/libs/zziplib/zziplib-src/SDL/Makefile.am index 99dd540180f..c66d443a567 100644 --- a/Build/source/libs/zziplib/zziplib-src/SDL/Makefile.am +++ b/Build/source/libs/zziplib/zziplib-src/SDL/Makefile.am @@ -8,10 +8,10 @@ EXTRA_DIST = $(sdl_DATA) check_PROGRAMS = zzcatsdl zzcatsdl_SOURCES = SDL_rwops_zzcat.c SDL_rwops_zzip.c -ZZIP_CFLAGS= `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --cflags` -ZZIP_LIBS= `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --libs` -SDL_CFLAGS= `export PKG_CONFIG_PATH=.; pkg-config sdl --cflags` -SDL_LIBS= `export PKG_CONFIG_PATH=.; pkg-config sdl --libs` +ZZIP_CFLAGS= `export PKG_CONFIG_PATH=../zzip; $(PKG_CONFIG) zziplib --cflags` +ZZIP_LIBS= `export PKG_CONFIG_PATH=../zzip; $(PKG_CONFIG) zziplib --libs` +SDL_CFLAGS= `export PKG_CONFIG_PATH=.; $(PKG_CONFIG) sdl --cflags` +SDL_LIBS= `export PKG_CONFIG_PATH=.; $(PKG_CONFIG) sdl --libs` CFLAGS= -I$(srcdir) $(ZZIP_CFLAGS) $(SDL_CFLAGS) LIBS= $(ZZIP_LIBS) $(SDL_LIBS) diff --git a/Build/source/libs/zziplib/zziplib-src/SDL/Makefile.in b/Build/source/libs/zziplib/zziplib-src/SDL/Makefile.in index 4230a66bbba..1eff3eaf5ca 100644 --- a/Build/source/libs/zziplib/zziplib-src/SDL/Makefile.in +++ b/Build/source/libs/zziplib/zziplib-src/SDL/Makefile.in @@ -103,9 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_compile_check_sizeof.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ $(top_srcdir)/m4/ax_check_aligned_access_required.m4 \ $(top_srcdir)/m4/ax_check_enable_debug.m4 \ - $(top_srcdir)/m4/ax_configure_args.m4 \ $(top_srcdir)/m4/ax_create_pkgconfig_info.m4 \ - $(top_srcdir)/m4/ax_enable_builddir.m4 \ $(top_srcdir)/m4/ax_expand_prefix.m4 \ $(top_srcdir)/m4/ax_maintainer_mode_auto_silent.m4 \ $(top_srcdir)/m4/ax_not_enable_frame_pointer.m4 \ @@ -304,6 +302,8 @@ PAX_TAR_CREATE = @PAX_TAR_CREATE@ PAX_TAR_EXTRACT = @PAX_TAR_EXTRACT@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ RANLIB = @RANLIB@ RELEASE_INFO = @RELEASE_INFO@ @@ -337,7 +337,6 @@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ -ax_enable_builddir_sed = @ax_enable_builddir_sed@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -393,10 +392,10 @@ zzipsdldir = ${includedir}/SDL_rwops_zzip zzipsdl_DATA = SDL_rwops_zzip.c SDL_rwops_zzip.h EXTRA_DIST = $(sdl_DATA) zzcatsdl_SOURCES = SDL_rwops_zzcat.c SDL_rwops_zzip.c -ZZIP_CFLAGS = `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --cflags` -ZZIP_LIBS = `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --libs` -SDL_CFLAGS = `export PKG_CONFIG_PATH=.; pkg-config sdl --cflags` -SDL_LIBS = `export PKG_CONFIG_PATH=.; pkg-config sdl --libs` +ZZIP_CFLAGS = `export PKG_CONFIG_PATH=../zzip; $(PKG_CONFIG) zziplib --cflags` +ZZIP_LIBS = `export PKG_CONFIG_PATH=../zzip; $(PKG_CONFIG) zziplib --libs` +SDL_CFLAGS = `export PKG_CONFIG_PATH=.; $(PKG_CONFIG) sdl --cflags` +SDL_LIBS = `export PKG_CONFIG_PATH=.; $(PKG_CONFIG) sdl --libs` CLEANFILES = *.pc *.omf pkgconfig_HEADERS = SDL_rwops_zzip.pc ERRNULL = 2>/dev/null diff --git a/Build/source/libs/zziplib/zziplib-src/SDL/zzip-sdl-config.pc b/Build/source/libs/zziplib/zziplib-src/SDL/zzip-sdl-config.pc deleted file mode 100644 index 46a06a97c58..00000000000 --- a/Build/source/libs/zziplib/zziplib-src/SDL/zzip-sdl-config.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -sdl_static_libs=-L/usr/lib -lSDL -lpthread -lm -ldl -lasound -laudio -lXt -L/usr/X11R6/lib -lX11 -lXext -sdl_libs=-L/usr/lib -lSDL -lpthread -sdl_cflags=-I/usr/include/SDL -D_REENTRANT - -Name: zzip-sdl-config -Version: 1.2.5 -Description: SDL Config (for ZZipLib) -Libs: ${sdl_libs} -Cflags: ${sdl_cflags} diff --git a/Build/source/libs/zziplib/zziplib-src/SDL/zzip-sdl-rwops.pc b/Build/source/libs/zziplib/zziplib-src/SDL/zzip-sdl-rwops.pc deleted file mode 100644 index 6a4b1d04377..00000000000 --- a/Build/source/libs/zziplib/zziplib-src/SDL/zzip-sdl-rwops.pc +++ /dev/null @@ -1,8 +0,0 @@ -zzipdatadir=/usr/local/share/zziplib -zzipsdlrwops=${zzipdatadir}/SDL - -Name: zzip-sdl-rwops -Version: 0.13.24 -Description: SDL_rwops for ZZipLib -Requires: zzip-sdl-config, zziplib -Cflags: -I${zzipsdlrwops} |