From 0b1bd8cf2f182374368ee5b80708aa79c47a343c Mon Sep 17 00:00:00 2001 From: lisyarus Date: Mon, 4 Dec 2023 18:15:02 +0300 Subject: [PATCH] Remove libmpg & libpng from packaging --- CMakeLists.txt | 2 -- package/linux/toolchain.cmake | 2 -- package/win/toolchain-target.cmake | 5 ----- 3 files changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fc7daf0..64e09fd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,8 +60,6 @@ if(PSEMEK_PACKAGE_MODE AND PSEMEK_PACKAGE_TARGET AND NOT PSEMEK_PACKAGE_AS_LIBRA set(Boost_USE_STATIC_LIBS ON) endif() -find_package(PNG REQUIRED) - add_subdirectory(tools) add_subdirectory(libs) diff --git a/package/linux/toolchain.cmake b/package/linux/toolchain.cmake index d58a0838..31b9c89a 100644 --- a/package/linux/toolchain.cmake +++ b/package/linux/toolchain.cmake @@ -9,8 +9,6 @@ set(PSEMEK_PACKAGE_TARGET ON) set(PSEMEK_PACKAGE_COPY_FILES ${PSEMEK_PACKAGE_ROOT}/sdl2/install/lib/libSDL2-2.0.so.0 - ${PSEMEK_PACKAGE_ROOT}/libpng* - ${PSEMEK_PACKAGE_ROOT}/libmpg123* ) list(APPEND CMAKE_PREFIX_PATH "${PSEMEK_PACKAGE_ROOT}/sdl2/install") diff --git a/package/win/toolchain-target.cmake b/package/win/toolchain-target.cmake index 152b6166..977a53f9 100644 --- a/package/win/toolchain-target.cmake +++ b/package/win/toolchain-target.cmake @@ -13,15 +13,10 @@ set(PSEMEK_PACKAGE_TOOLS_PATH "${PSEMEK_PACKAGE_ROOT}/tools") set(PSEMEK_PACKAGE_COPY_FILES ${PSEMEK_PACKAGE_ROOT}/sdl2/install/bin/SDL2.dll - ${PSEMEK_PACKAGE_ROOT}/libmpg/install/bin/libmpg123-0.dll - ${PSEMEK_PACKAGE_ROOT}/libpng/install/bin/libpng16-16.dll - ${PSEMEK_PACKAGE_ROOT}/zlib/install/bin/zlib1.dll /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll ) list(APPEND CMAKE_PREFIX_PATH "${PSEMEK_PACKAGE_ROOT}/sdl2/install" "${PSEMEK_PACKAGE_ROOT}/boost/install" - "${PSEMEK_PACKAGE_ROOT}/libpng/install" - "${PSEMEK_PACKAGE_ROOT}/zlib/install" )