diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-05-15 10:28:29 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-05-15 10:28:29 +0000 |
| commit | 5f07aa9d5acbd091b1aeb38a10d157314e92fb35 (patch) | |
| tree | 3b82ec7bc3f9d22fdf0ae631c2d5826632b6965a | |
| parent | Style rewrite: Unquote strings from libcroco. Fixes 1303422. (diff) | |
| parent | win64: add poppler to build (diff) | |
| download | inkscape-5f07aa9d5acbd091b1aeb38a10d157314e92fb35.tar.gz inkscape-5f07aa9d5acbd091b1aeb38a10d157314e92fb35.zip | |
Update to tip.
(bzr r13341.1.24)
| -rw-r--r-- | build-x64.xml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/build-x64.xml b/build-x64.xml index 6bb8c52e9..74d7c2e28 100644 --- a/build-x64.xml +++ b/build-x64.xml @@ -183,9 +183,11 @@ #undef HAVE_SSL /* use poppler for pdf import? */ - //#define HAVE_POPPLER 1 - //#define HAVE_POPPLER_GLIB 1 - //#define HAVE_POPPLER_CAIRO 1 + #define HAVE_POPPLER 1 + #define HAVE_POPPLER_GLIB 1 + #define HAVE_POPPLER_CAIRO 1 + #define POPPLER_NEW_ERRORAPI 1 + #define POPPLER_NEW_GFXPATCH 1 /* do we want bitmap manipulation? */ #define WITH_IMAGE_MAGICK 1 @@ -723,19 +725,16 @@ <copy todir="${dist}" file="${devlibs}/bin/bz2-1.dll"/> <copy todir="${dist}" file="${devlibs}/bin/libiconv-2.dll"/> <copy todir="${dist}" file="${devlibs}/bin/libpopt-0.dll"/> -<!-- <copy todir="${dist}" file="${devlibs}/bin/liblcms-1.dll"/> --> <copy todir="${dist}" file="${devlibs}/bin/liblcms2-2.dll"/> <copy todir="${dist}" file="${devlibs}/bin/libMagick++-6.Q16-3.dll"/> <copy todir="${dist}" file="${devlibs}/bin/libMagickCore-6.Q16-2.dll"/> <copy todir="${dist}" file="${devlibs}/bin/libMagickWand-6.Q16-2.dll"/> -<!-- <copy todir="${dist}" file="${devlibs}/bin/intl.dll"/> --> <copy todir="${dist}" file="${devlibs}/bin/libintl-8.dll"/> <!-- MINGW support DLLs --> <copy todir="${dist}" file="${mingw_bin}/libstdc++-6.dll"/> <copy todir="${dist}" file="${mingw_bin}/libwinpthread-1.dll"/> <copy todir="${dist}" file="${mingw_bin}/libgcc_s_sjlj-1.dll"/> <!-- MINGW support DLLs needed for openmp support --> -<!-- <copy todir="${dist}" file="${mingw_bin}/mingwm10.dll"/> --> <copy todir="${dist}" file="${mingw_bin}/libgomp-1.dll"/> <!-- MSGFMT files --> |