summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2011-02-01 18:44:12 +0100
committerMathias Bauer <mba@openoffice.org>2011-02-01 18:44:12 +0100
commit2e98dd0232e6f593998060844c50851a54bd3cef (patch)
treeb9b4f9f03a952c9f43e6dee98037a26a28ea927c /xmloff
parentd1d8b2619b4ddd60fdb658240e48fa223d5b53ae (diff)
CWS gnumake3: use standard linked libs on Windows
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/Library_xo.mk11
-rw-r--r--xmloff/Library_xof.mk11
2 files changed, 2 insertions, 20 deletions
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 566154a3c480..1aa8b6407eae 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_add_linked_libs,xo,\
tl \
utl \
vos3 \
+ $(gb_StdLibs) \
))
$(eval $(call gb_Library_add_exception_objects,xo,\
@@ -395,19 +396,9 @@ $(eval $(call gb_Library_add_linked_libs,xo,\
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
- moldname \
mingwex \
kernel32 \
msvcrt \
- user32 \
-))
-else
-$(eval $(call gb_Library_add_linked_libs,xo,\
- kernel32 \
- msvcrt \
- oldnames \
- user32 \
- uwinapi \
))
endif
endif
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index be5c7144aa6e..55e3fbdd66ee 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,xof,\
salhelper \
stl \
xo \
+ $(gb_StdLibs) \
))
$(eval $(call gb_Library_add_exception_objects,xof,\
@@ -106,19 +107,9 @@ $(eval $(call gb_Library_add_linked_libs,xof,\
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
- moldname \
mingwex \
kernel32 \
msvcrt \
- user32 \
-))
-else
-$(eval $(call gb_Library_add_linked_libs,xof,\
- kernel32 \
- msvcrt \
- oldnames \
- user32 \
- uwinapi \
))
endif
endif