summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-10-12 00:46:00 +0100
committerCarl Hetherington <cth@carlh.net>2018-10-12 00:46:00 +0100
commit72b11d5eb036651b6ff68edf3ed270e8fc52960f (patch)
treec6b88de5c86696f186c93322d50fd954d09c9349 /platform
parentc4ac1ba47652884a647103ec49b2de4c0b6e60a9 (diff)
Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg
to decode images. Hence remove {Image,Graphics}Magick.
Diffstat (limited to 'platform')
-rw-r--r--platform/osx/make_dmg.sh3
-rw-r--r--platform/windows/wscript3
2 files changed, 0 insertions, 6 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 487f03e15..513ae75ea 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -79,9 +79,6 @@ function copy_libs {
universal_copy_lib $ENV libglib-2 "$dest"
universal_copy_lib $ENV libintl "$dest"
universal_copy_lib $ENV libsndfile "$dest"
- universal_copy_lib $ENV libMagick++ "$dest"
- universal_copy_lib $ENV libMagickCore "$dest"
- universal_copy_lib $ENV libMagickWand "$dest"
universal_copy_lib $ENV libssh "$dest"
universal_copy_lib $ENV libwx "$dest"
universal_copy_lib $ENV libfontconfig "$dest"
diff --git a/platform/windows/wscript b/platform/windows/wscript
index 15f2ce780..5f321cc76 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -93,9 +93,6 @@ File "%static_deps%/bin/libglib-2.0-0.dll"
File "%static_deps%/bin/libgobject-2.0-0.dll"
File "%static_deps%/bin/libiconv-2.dll"
File "%static_deps%/bin/libjpeg-9.dll"
-File "%static_deps%/bin/libGraphicsMagick-3.dll"
-File "%static_deps%/bin/libGraphicsMagickWand-2.dll"
-File "%static_deps%/bin/libGraphicsMagick++-11.dll"
File "%static_deps%/bin/libpng16-16.dll"
File "%static_deps%/bin/libsigc-2.0-0.dll"
File "%static_deps%/bin/libsndfile-1.dll"