diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-04-13 16:11:41 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 14:24:10 +0200 |
| commit | bd162cb75a4115affb5451584bd9f094f3e37905 (patch) | |
| tree | 462c5ae1fbb5bf3a6b40398a8f32aefda886d980 /basegfx | |
| parent | e9f6edc64553e458e15111aca6f3e778eb7afa2c (diff) | |
gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd]
Diffstat (limited to 'basegfx')
| -rw-r--r-- | basegfx/Library_basegfx.mk | 3 | ||||
| -rw-r--r-- | basegfx/StaticLibrary_basegfx_s.mk | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index cef63ab4f72a..7fc527f3f103 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,basegfx,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,basegfx,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,basegfx,\ -DBASEGFX_DLLIMPLEMENTATION \ )) diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk index 3c871fd293c9..36f6117a1171 100644 --- a/basegfx/StaticLibrary_basegfx_s.mk +++ b/basegfx/StaticLibrary_basegfx_s.mk @@ -44,8 +44,7 @@ $(eval $(call gb_StaticLibrary_set_include,basegfx_s,\ # this means that all code of this static library will end in a dll # thus the _DLL define must be set to avoid link problems with stlport symbols # the BASEGFX_STATICLIBRARY define will expand all BASEGFX_DLLPRIVATE/PUBLIC macros to nothing -$(eval $(call gb_StaticLibrary_set_defs,basegfx_s,\ - $$(DEFS) \ +$(eval $(call gb_StaticLibrary_add_defs,basegfx_s,\ -DBASEGFX_STATICLIBRARY \ -D_DLL \ )) |