diff options
Diffstat (limited to 'svtools/Library_svt.mk')
| -rw-r--r-- | svtools/Library_svt.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index c7dab0f17746..3c666bfeb548 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -39,10 +39,10 @@ $(eval $(call gb_Library_set_include,svt,\ -I$(WORKDIR)/inc/svtools \ -I$(WORKDIR)/inc/ \ -I$(OUTDIR)/inc/ \ - -I$(SRCDIR)/svtools/inc \ - -I$(SRCDIR)/svtools/inc/svtools \ - -I$(SRCDIR)/svtools/source/inc \ - -I$(SRCDIR)/svtools/inc/pch \ + -I$(realpath $(SRCDIR)/svtools/inc) \ + -I$(realpath $(SRCDIR)/svtools/inc/svtools) \ + -I$(realpath $(SRCDIR)/svtools/source/inc) \ + -I$(realpath $(SRCDIR)/svtools/inc/pch) \ -I$(OUTDIR)/inc/offuh \ )) @@ -60,16 +60,15 @@ $(eval $(call gb_Library_add_linked_libs,svt,\ i18nutil \ icuuc \ jvmfwk \ + salhelper \ sal \ sot \ - stl \ svl \ tk \ tl \ ucbhelper \ utl \ vcl \ - vos3 \ $(gb_STDLIBS) \ )) @@ -77,9 +76,6 @@ ifeq ($(SYSTEM_JPEG),YES) $(eval $(call gb_Library_add_linked_libs,svt,\ jpeg \ )) -$(eval $(call gb_Library_set_ldflags,svt,\ - $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \ -)) else $(eval $(call gb_Library_add_linked_static_libs,svt,\ jpeglib \ @@ -219,6 +215,8 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/misc/ehdl \ svtools/source/misc/embedhlp \ svtools/source/misc/embedtransfer \ + svtools/source/misc/filterutils \ + svtools/source/misc/filechangedchecker \ svtools/source/misc/helpagentwindow \ svtools/source/misc/imagemgr \ svtools/source/misc/imageresourceaccess \ @@ -227,6 +225,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/misc/imap3 \ svtools/source/misc/itemdel \ svtools/source/misc/langtab \ + svtools/source/misc/langhelp \ svtools/source/misc/stringtransfer \ svtools/source/misc/svtaccessiblefactory \ svtools/source/misc/svtdata \ |