summaryrefslogtreecommitdiff
blob: 194f278b958df42906baf7fb114849ed64dc63e6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
Description: Remove embedded libraries in Irrlicht source (flagged by lintian)
 Since removing the subdirectories containing libjpeg/libpng/zlib/bzip2/lzma
 would make this patch way too large, this patch should be applied on top of
	rm -rf lib/jpeglib/
	rm -rf lib/zlib/
	rm -rf lib/libpng/
 in debian/rules (e.g. in the clean target).
Forwarded: no
Author: Vincent Cheng <vcheng@debian.org>
Last-Update: 2016-07-07

--- a/lib/irrlicht/CMakeLists.txt
+++ b/lib/irrlicht/CMakeLists.txt
@@ -2,9 +2,6 @@
 find_package(PNG REQUIRED)
 find_package(JPEG REQUIRED)
 
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
-                    "${JPEG_INCLUDE_DIR}"
-                    "${PNG_INCLUDE_DIRS}"
-                    "${ZLIB_INCLUDE_DIR}")
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)
 
 if(MSVC OR APPLE)
@@ -576,7 +573,7 @@
 endif()
 
 add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES})

-target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
+target_link_libraries(stkirrlicht png jpeg z)
 
 if(NOT SERVER_ONLY)