diff options
| author | Jonas Karlsson <jonaskarlsson@fripost.org> | 2019-10-09 14:23:23 +0200 |
|---|---|---|
| committer | Jonas Karlsson <jonaskarlsson@fripost.org> | 2019-10-09 22:06:32 +0200 |
| commit | 17e9132f737a87bcbb49312fc48da762800ef471 (patch) | |
| tree | f12b653f989284bc98ea2496ecf880b9474132cc | |
| parent | 5ff754893123c6e7ece967cef1bdc90279196192 (diff) | |
| download | vcpkg-17e9132f737a87bcbb49312fc48da762800ef471.tar.gz vcpkg-17e9132f737a87bcbb49312fc48da762800ef471.zip | |
[irrlicht] do not build exisiting dependencies
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
| -rw-r--r-- | ports/irrlicht/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ports/irrlicht/CONTROL | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ports/irrlicht/CMakeLists.txt b/ports/irrlicht/CMakeLists.txt index ef4439126..3eda8264a 100644 --- a/ports/irrlicht/CMakeLists.txt +++ b/ports/irrlicht/CMakeLists.txt @@ -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
# -------------------------------------------------------------------------------------------------
diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL index d92222ec5..155b2f38b 100644 --- a/ports/irrlicht/CONTROL +++ b/ports/irrlicht/CONTROL @@ -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
|