diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2011-06-11 09:48:13 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2011-06-11 09:48:13 +0000 |
| commit | 3a86fbe8f7ffd5782c1cb736192d4ee5a5dc6d7f (patch) | |
| tree | c2b44bcc773a5fbefa23e2cfd06a2c59aceebba3 | |
| parent | Fix debus warnings and build errors. (diff) | |
| download | inkscape-3a86fbe8f7ffd5782c1cb736192d4ee5a5dc6d7f.tar.gz inkscape-3a86fbe8f7ffd5782c1cb736192d4ee5a5dc6d7f.zip | |
Update to win32 build defines for libwpg issue.
(bzr r10269)
| -rw-r--r-- | build-lx.xml | 3 | ||||
| -rwxr-xr-x | build.xml | 3 | ||||
| -rw-r--r-- | src/extension/internal/wpg-input.cpp | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/build-lx.xml b/build-lx.xml index 4f81783ef..307bbb2d8 100644 --- a/build-lx.xml +++ b/build-lx.xml @@ -173,6 +173,9 @@ /* Allow reading WordPerfect? */ #define WITH_LIBWPG 1 + /* Default to libwpg 0.1.x */ + #define WITH_LIBWPG01 1 + #endif /* _CONFIG_H_ */ </makefile> </target> @@ -187,6 +187,9 @@ /* Allow reading WordPerfect? */ #define WITH_LIBWPG 1 + /* Default to libwpg 0.1.x */ + #define WITH_LIBWPG01 1 + /* Do we support SVG Fonts? */ #define ENABLE_SVG_FONTS 1 diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp index b6425b380..3cd5044f7 100644 --- a/src/extension/internal/wpg-input.cpp +++ b/src/extension/internal/wpg-input.cpp @@ -49,6 +49,11 @@ #include "extension/input.h" #include "document.h" +// Take a guess and fallback to 0.1.x if no configure has run +#if !defined(WITH_LIBWPG01) && !defined(WITH_LIBWPG02) +#define WITH_LIBWPG01 1 +#endif + #include "libwpg/libwpg.h" #if WITH_LIBWPG01 #include "libwpg/WPGStreamImplementation.h" |