diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-05-17 12:42:09 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-05-17 12:42:09 +0200 |
| commit | 036132d4a57858040248eda1ee4a4932b5b6c789 (patch) | |
| tree | eabbab65b99b3ac4b5e6d4c91a231a9ac952fb38 /writerperfect | |
| parent | 4a7cfffd5757a7cf50b03b13b88940ca7c49c335 (diff) | |
Make writerperfect actually build again
Diffstat (limited to 'writerperfect')
| -rw-r--r-- | writerperfect/prj/build.lst | 5 | ||||
| -rw-r--r-- | writerperfect/source/vsdimp/VisioImportFilter.cxx | 1 | ||||
| -rw-r--r-- | writerperfect/util/makefile.mk | 10 |
3 files changed, 12 insertions, 4 deletions
diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst index 4e083aeda8e8..4c732907a81f 100644 --- a/writerperfect/prj/build.lst +++ b/writerperfect/prj/build.lst @@ -1,8 +1,9 @@ -wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL +wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL wp writerperfect usr1 - all wp_mkout NULL wp writerperfect\source\stream nmake - all wp_stream NULL wp writerperfect\source\filter nmake - all wp_filter NULL wp writerperfect\source\wpdimp nmake - all wp_wpdimp NULL wp writerperfect\source\wpsimp nmake - all wp_wpsimp NULL wp writerperfect\source\wpgimp nmake - all wp_wpgimp NULL -wp writerperfect\util nmake - all wp_util wp_wpgimp wp_wpsimp wp_wpdimp wp_filter wp_stream NULL +wp writerperfect\source\vsdimp nmake - all wp_vsdimp NULL +wp writerperfect\util nmake - all wp_util wp_vsdimp wp_wpgimp wp_wpsimp wp_wpdimp wp_filter wp_stream NULL diff --git a/writerperfect/source/vsdimp/VisioImportFilter.cxx b/writerperfect/source/vsdimp/VisioImportFilter.cxx index 669b9defdf4c..4bfb8316e538 100644 --- a/writerperfect/source/vsdimp/VisioImportFilter.cxx +++ b/writerperfect/source/vsdimp/VisioImportFilter.cxx @@ -46,6 +46,7 @@ #include <xmloff/attrlist.hxx> +#include <libvisio/libvisio.h> #include "filter/DocumentHandler.hxx" #include "filter/OdgGenerator.hxx" #include "VisioImportFilter.hxx" diff --git a/writerperfect/util/makefile.mk b/writerperfect/util/makefile.mk index de385690b219..6ec196891b9e 100644 --- a/writerperfect/util/makefile.mk +++ b/writerperfect/util/makefile.mk @@ -25,6 +25,12 @@ LIBWPG=$(LIBWPG_LIBS) LIBWPG=-lwpglib .ENDIF +.IF "$(SYSTEM_LIBVISIO)" == "YES" +LIBWPG=$(LIBVISIO_LIBS) +.ELSE +LIBWPG=-lvisiolib +.ENDIF + .ELSE LIBWPD=$(LIBPRE) wpdlib.lib @@ -117,11 +123,11 @@ SHL3LIBS = $(LIB3TARGET) SHL3VERSIONMAP = $(SOLARENV)/src/component.map DEF3NAME = $(SHL3TARGET) -LIB4TARGET= $(SLB)$/wpgimport.lib +LIB4TARGET= $(SLB)$/visioimport.lib LIB4FILES= \ $(SLB)$/stream.lib \ $(SLB)$/filter.lib \ - $(SLB)$/vpsimp.lib + $(SLB)$/vsdimp.lib SHL4LIBS=$(LIB4TARGET) SHL4STDLIBS+= \ $(SVLLIB) \ |