diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-19 19:28:36 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:33 +0200 |
| commit | 2f6261fa07e496439e4476d2be2c4c9bca9e6e52 (patch) | |
| tree | b4d42a82b581c1ab0c47d14eb2b066a191e2264b /writerperfect | |
| parent | 8b4deabeedd09f5968fa90ae04209ded4a717f6f (diff) | |
find lots of external static libraries in UnpackedTarball dir
Note: do NOT put file paths to static libraries into FOO_LIBS variables
that are passed to bundled externals that are built with --enable-static:
on Mac OS X this will result in .a archives that contain other .a
archives as entries, and trying to link those results in errors like:
ld: warning: ignoring file .../libodfgen-0.0.a, file was built for
archive which is not the architecture being linked (i386)
Change-Id: If2c5a458058e4da76f80b3643e55b489d1edee24
Diffstat (limited to 'writerperfect')
| -rw-r--r-- | writerperfect/Library_wpftdraw.mk | 2 | ||||
| -rw-r--r-- | writerperfect/Library_wpftwriter.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index 5bb7fdaf6014..2033ca063483 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -54,8 +54,8 @@ $(eval $(call gb_Library_use_externals,wpftdraw,\ mspub \ odfgen \ visio \ - wpd \ wpg \ + wpd \ zlib \ )) diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk index 7dc5203d1a15..502668fbdc1e 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -51,9 +51,9 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\ boost_headers \ mwaw \ odfgen \ - wpd \ - wpg \ wps \ + wpg \ + wpd \ zlib \ )) |