diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/JunitTest_framework_complex.mk | 2 | ||||
| -rw-r--r-- | framework/JunitTest_framework_unoapi.mk | 2 | ||||
| -rw-r--r-- | framework/Library_fwe.mk | 8 | ||||
| -rw-r--r-- | framework/Library_fwi.mk | 3 |
4 files changed, 4 insertions, 11 deletions
diff --git a/framework/JunitTest_framework_complex.mk b/framework/JunitTest_framework_complex.mk index 5865a6fb9f38..d7dba37635ff 100644 --- a/framework/JunitTest_framework_complex.mk +++ b/framework/JunitTest_framework_complex.mk @@ -25,7 +25,7 @@ # #************************************************************************* -$(eval $(call gb_JunitTest_JunitTest,framework_complex)) +$(eval $(call gb_JunitTest_JunitTest,framework_complex,SRCDIR)) $(eval $(call gb_JunitTest_set_defs,framework_complex,\ $$(DEFS) \ diff --git a/framework/JunitTest_framework_unoapi.mk b/framework/JunitTest_framework_unoapi.mk index e8dbe205d7f4..73d9ca1ffbb5 100644 --- a/framework/JunitTest_framework_unoapi.mk +++ b/framework/JunitTest_framework_unoapi.mk @@ -25,7 +25,7 @@ # #************************************************************************* -$(eval $(call gb_JunitTest_JunitTest,framework_unoapi)) +$(eval $(call gb_JunitTest_JunitTest,framework_unoapi,SRCDIR)) $(eval $(call gb_JunitTest_set_defs,framework_unoapi,\ $$(DEFS) \ diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index b69a3a7e33e4..9a71be9ef554 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -36,8 +36,7 @@ $(eval $(call gb_Library_set_include,fwe,\ -I$(OUTDIR)/inc/framework \ )) -$(eval $(call gb_Library_set_defs,fwe,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,fwe,\ -DFWE_DLLIMPLEMENTATION\ )) @@ -95,9 +94,4 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/xml/xmlnamespaces \ )) -#todo: ImageListDescriptor can't be exported completely without exporting everything -ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS)))) -endif - # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 681bd93a4b10..105d5a265784 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -29,8 +29,7 @@ $(eval $(call gb_Library_Library,fwi)) $(eval $(call gb_Library_add_package_headers,fwi,framework_inc)) -$(eval $(call gb_Library_set_defs,fwi,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,fwi,\ -DFWI_DLLIMPLEMENTATION \ )) |