diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-10-09 13:57:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-09 13:57:04 -0700 |
| commit | f3caee1cf06db3f74e3c57748c74627fd422d836 (patch) | |
| tree | 465957a6bfa47d3ac1231b4c5b70fadee9f7cbda | |
| parent | 6e39eaaa96183cfbe1df95bc0a99a0698adb4c6b (diff) | |
| parent | 17e9132f737a87bcbb49312fc48da762800ef471 (diff) | |
| download | vcpkg-f3caee1cf06db3f74e3c57748c74627fd422d836.tar.gz vcpkg-f3caee1cf06db3f74e3c57748c74627fd422d836.zip | |
Merge pull request #8535 from karjonas/irrlicht_deps
[irrlicht] do not build exisiting dependencies
| -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
|