[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Executable_soffice.mk

[Caolán McNamara]

 desktop/Executable_soffice.bin.mk |    4 ++--
 desktop/Executable_soffice.mk     |    3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit aba21544bc36cba0cb24778da493ac32c697c3cb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 21 15:07:57 2011 +0100

    get it to link with msvc at least

diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index 7429b86..db23a7c 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Executable_set_include,soffice.bin,\
 $(eval $(call gb_Executable_add_linked_libs,soffice.bin,\
     sal \
     sofficeapp \
+    user32 \
 ))
 
 $(eval $(call gb_Executable_add_cobjects,soffice.bin,\
@@ -53,8 +54,7 @@ $(eval $(call gb_Executable_add_linked_static_libs,soffice.bin,\
 
 ifeq ($(COM),MSC)
 
-$(eval $(call gb_Executable_set_ldflags,soffice.bin,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Executable_add_ldflags,soffice.bin,\
     /STACK:10000000 \
 ))
 
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 0eca50e..0be0fd3 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -36,9 +36,6 @@ $(eval $(call gb_Executable_set_include,soffice,\
 
 $(eval $(call gb_Executable_add_linked_libs,soffice,\
     sal \
-))
-
-$(eval $(call gb_Executable_add_linked_libs,soffice,\
     advapi32 \
     shell32 \
     shlwapi \