diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-09-15 14:01:35 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2011-09-15 14:07:28 +0200 |
| commit | 8c8b34694aa803d155e38ca30a3816b5c1b06a45 (patch) | |
| tree | 41d8062d8ad924e95a4a3d3656aa514d533c1021 /filter/Library_svgfilter.mk | |
| parent | a254cf292c5679843c6fa2624fa1aa5ce69e39fe (diff) | |
filter: svg: adapt to changes in LO
Diffstat (limited to 'filter/Library_svgfilter.mk')
| -rw-r--r-- | filter/Library_svgfilter.mk | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index 31087a1232ab..23119d4ad705 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -19,8 +19,14 @@ $(eval $(call gb_Library_Library,svgfilter)) +$(eval $(call gb_Library_add_package_headers,svgfilter,filter_generated)) + $(eval $(call gb_Library_set_componentfile,svgfilter,filter/source/svg/svgfilter)) +$(eval $(call gb_Library_add_defs,svgfilter,\ + -DUSE_MODERN_SPIRIT \ +)) + $(eval $(call gb_Library_add_api,svgfilter,\ udkapi \ offapi \ @@ -29,6 +35,7 @@ $(eval $(call gb_Library_add_api,svgfilter,\ $(eval $(call gb_Library_set_include,svgfilter,\ -I$(SRCDIR)/filter/inc/pch \ $$(INCLUDE) \ + -I$(WORKDIR)/CustomTarget/filter/source/svg \ )) $(eval $(call gb_Library_add_linked_libs,svgfilter,\ @@ -48,25 +55,21 @@ $(eval $(call gb_Library_add_linked_libs,svgfilter,\ $(gb_STDLIBS) \ )) -ifneq ($(SOLAR_JAVA),) -$(eval $(call gb_Library_add_linked_libs,svgfilter,\ - jvmaccess \ -)) -endif +$(call gb_Library_use_externals,svgfilter,libxml2) $(eval $(call gb_Library_add_exception_objects,svgfilter,\ + filter/source/svg/b2dellipse \ filter/source/svg/impsvgdialog \ + filter/source/svg/parserfragments \ filter/source/svg/svgdialog \ filter/source/svg/svgexport \ filter/source/svg/svgfilter \ filter/source/svg/svgfontexport \ - filter/source/svg/svgwriter \ -)) - -ifneq ($(SOLAR_JAVA),) -$(eval $(call gb_Library_add_exception_objects,svgfilter,\ filter/source/svg/svgimport \ + filter/source/svg/svgreader \ + filter/source/svg/svgwriter \ + filter/source/svg/tokenmap \ + filter/source/svg/units \ )) -endif # vim: set noet sw=4 ts=4: |