lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove libmpg & libpng from packaging

Browse source
This commit is contained in:
Nikita Lisitsa 2023-12-04 18:15:02 +03:00
parent de9c695a7a
commit 0b1bd8cf2f
3 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -60,8 +60,6 @@ if(PSEMEK_PACKAGE_MODE AND PSEMEK_PACKAGE_TARGET AND NOT PSEMEK_PACKAGE_AS_LIBRA
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
endif() endif()
find_package(PNG REQUIRED)
add_subdirectory(tools) add_subdirectory(tools)
add_subdirectory(libs) add_subdirectory(libs)

2
package/linux/toolchain.cmake
View file

@ -9,8 +9,6 @@ set(PSEMEK_PACKAGE_TARGET ON)
set(PSEMEK_PACKAGE_COPY_FILES set(PSEMEK_PACKAGE_COPY_FILES
${PSEMEK_PACKAGE_ROOT}/sdl2/install/lib/libSDL2-2.0.so.0 ${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") list(APPEND CMAKE_PREFIX_PATH "${PSEMEK_PACKAGE_ROOT}/sdl2/install")

5
package/win/toolchain-target.cmake
View file

@ -13,15 +13,10 @@ set(PSEMEK_PACKAGE_TOOLS_PATH "${PSEMEK_PACKAGE_ROOT}/tools")
set(PSEMEK_PACKAGE_COPY_FILES set(PSEMEK_PACKAGE_COPY_FILES
${PSEMEK_PACKAGE_ROOT}/sdl2/install/bin/SDL2.dll ${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 /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll
) )
list(APPEND CMAKE_PREFIX_PATH list(APPEND CMAKE_PREFIX_PATH
"${PSEMEK_PACKAGE_ROOT}/sdl2/install" "${PSEMEK_PACKAGE_ROOT}/sdl2/install"
"${PSEMEK_PACKAGE_ROOT}/boost/install" "${PSEMEK_PACKAGE_ROOT}/boost/install"
"${PSEMEK_PACKAGE_ROOT}/libpng/install"
"${PSEMEK_PACKAGE_ROOT}/zlib/install"
) )