The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-22 18:47:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[irrlicht] do not build exisiting dependencies

Browse Source 
Since libjpeg, libpng, zlib and bzlib are provided as dependencies
through vcpkg, we disable building them in irrlicht. This fixes a
runtime error steming from a version mismatch between the libjpeg
versions provided by irrlicht and vcpkg respectively
This commit is contained in:
Jonas Karlsson 2019-10-09 14:23:23 +02:00
parent 5ff7548931
commit 17e9132f73
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/irrlicht/CMakeLists.txt
View File

@ -137,6 +137,14 @@ if(NOT ${IRR_SHARED_LIB})
target_compile_definitions(Irrlicht PUBLIC _IRR_STATIC_LIB_)
endif()
# Disable Irrlicht building already provided dependencies
target_compile_definitions(Irrlicht
PRIVATE NO_IRR_USE_NON_SYSTEM_ZLIB_
PRIVATE NO_IRR_USE_NON_SYSTEM_LIB_PNG_
PRIVATE NO_IRR_USE_NON_SYSTEM_BZLIB_
PRIVATE NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
)
# Per platform config
# -------------------------------------------------------------------------------------------------

2
ports/irrlicht/CONTROL
View File

@ -1,5 +1,5 @@
Source: irrlicht
Version: 1.8.4-3
Version: 1.8.4-4
Homepage: http://irrlicht.sourceforge.net
Description: Irrlicht lightning fast 3d engine
Build-Depends: zlib, libpng, bzip2, libjpeg-turbo