diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-09-21 16:59:22 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-21 16:59:22 +0100 |
commit | 5663d30591bba0ba56253ae0d23d5066d8064605 (patch) | |
tree | b8ea127782e7d04cd95c7018fc9bfcbd656eb958 | |
parent | e19f926ba247b4b84c4efa368cf19c312f5f51e7 (diff) |
get bean linking under windows
-rw-r--r-- | bean/Library_officebean.mk | 13 | ||||
-rw-r--r-- | solenv/gbuild/platform/windows.mk | 1 | ||||
-rw-r--r-- | solenv/gbuild/platform/winmingw.mk | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 2aa91fef9f5c..7eb4f6661a87 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 5c1b3588c022..72dcde1346e7 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 e447752a8d0a..934588a218bf 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 \ |