diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 15:43:53 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:08 +0200 |
| commit | fa489789359d130735a814366154a3d91ec882a9 (patch) | |
| tree | e7e922291650c62d25d89d34c4a00b7c10ab6f18 | |
| parent | dc397aae70433c0086ef41f4dac5289fb07a9b19 (diff) | |
bean: just use AWTLIB on all platfroms to simplify this
Change-Id: I6c8bc792a57750b7fd5f36e3eb97f76870a7a632
| -rw-r--r-- | bean/Library_officebean.mk | 16 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 6 insertions, 16 deletions
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 94f4a0451c1e..64caf3dea54f 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -44,29 +44,15 @@ $(eval $(call gb_Library_add_cobjects,officebean,\ )) endif -ifeq ($(GUI),WNT) - $(eval $(call gb_Library_use_libraries,officebean,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_system_win32_libs,officebean,\ - jawt \ -)) - -else - $(eval $(call gb_Library_add_libs,officebean,\ - $(AWTLIB) \ -)) - -$(eval $(call gb_Library_add_ldflags,officebean,\ $(JAVALIB) \ + $(AWTLIB) \ )) - -endif - $(eval $(call gb_Library_add_standard_system_libs,officebean)) # vim: set noet sw=4 ts=4: diff --git a/configure.in b/configure.in index c1abd8aa2ddb..be6397872024 100644 --- a/configure.in +++ b/configure.in @@ -5982,7 +5982,11 @@ if test "$SOLAR_JAVA" != ""; then LD_LIBRARY_PATH=$save_LD_LIBRARY_PATH fi if test -z "$AWTLIB"; then - AWTLIB=-ljawt + if test $_os = WINNT -a "$WITH_MINGW" != yes; then + AWTLIB=jawt.lib + else + AWTLIB=-ljawt + fi fi AC_MSG_RESULT([$AWTLIB]) AC_SUBST(AWTLIB) |