diff options
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/JunitTest_svtools_unoapi.mk | 2 | ||||
| -rw-r--r-- | svtools/Library_svt.mk | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/svtools/JunitTest_svtools_unoapi.mk b/svtools/JunitTest_svtools_unoapi.mk index 42f3c09af363..665adee8f172 100644 --- a/svtools/JunitTest_svtools_unoapi.mk +++ b/svtools/JunitTest_svtools_unoapi.mk @@ -25,7 +25,7 @@ # #************************************************************************* -$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi)) +$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi,SRCDIR)) $(eval $(call gb_JunitTest_set_defs,svtools_unoapi,\ $$(DEFS) \ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index c3dac5e44649..ea6a568da171 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -50,8 +50,7 @@ $(eval $(call gb_Library_set_include,svt,\ -I$(realpath $(SRCDIR)/svtools/inc) \ )) -$(eval $(call gb_Library_set_defs,svt,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,svt,\ -DSVT_DLLIMPLEMENTATION \ )) @@ -62,7 +61,6 @@ $(eval $(call gb_Library_add_linked_libs,svt,\ cppuhelper \ i18nisolang1 \ i18nutil \ - icuuc \ jvmfwk \ salhelper \ sal \ @@ -76,15 +74,10 @@ $(eval $(call gb_Library_add_linked_libs,svt,\ $(gb_STDLIBS) \ )) -ifeq ($(SYSTEM_JPEG),YES) -$(eval $(call gb_Library_add_linked_libs,svt,\ +$(call gb_Library_use_externals,svt,\ + icuuc \ jpeg \ -)) -else -$(eval $(call gb_Library_add_linked_static_libs,svt,\ - jpeglib \ -)) -endif +) $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/brwbox/brwbox1 \ |