[Libreoffice-commits] .: bean/Library_officebean.mk solenv/gbuild

[Caolán McNamara]

 bean/Library_officebean.mk         |   13 +++++++++++++
 solenv/gbuild/platform/windows.mk  |    1 +
 solenv/gbuild/platform/winmingw.mk |    1 +
 3 files changed, 15 insertions(+)

New commits:
commit 5663d30591bba0ba56253ae0d23d5066d8064605
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 21 16:59:22 2011 +0100

    get bean linking under windows

diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index 2aa91fe..7eb4f66 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -43,6 +43,15 @@ $(eval $(call gb_Library_add_cobjects,officebean,\
 ))
 endif
 
+ifeq ($(GUI),WNT)
+
+$(eval $(call gb_Library_add_linked_libs,officebean,\
+    user32 \
+    jawt \
+))
+
+else
+
 $(eval $(call gb_Library_add_libs,officebean,\
 	$(AWTLIB) \
 ))
@@ -50,3 +59,7 @@ $(eval $(call gb_Library_add_libs,officebean,\
 $(eval $(call gb_Library_add_ldflags,officebean,\
 	$(JAVALIB) \
 ))
+
+
+endif
+
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 5c1b358..72dcde1 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -434,6 +434,7 @@ gb_Library_PLAINLIBS_NONE += \
 	gnu_getopt \
 	imm32\
 	kernel32 \
+	jawt \
 	libcmt \
 	mpr \
 	msi \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index e447752..934588a 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -446,6 +446,7 @@ gb_Library_PLAINLIBS_NONE += \
 	gnu_getopt \
 	imm32 \
 	kernel32 \
+	jawt \
 	msi \
 	msimg32 \
 	msvcrt \