[Libreoffice-commits] .: desktop/Executable_guiloader.mk desktop/Executable_guistdio.mk desktop/Executable_officeloader.mk desktop/Library_deploymentgui.mk desktop/Library_deployment.mk

[Caolán McNamara]

 desktop/Executable_guiloader.mk    |    9 +++++++++
 desktop/Executable_guistdio.mk     |    9 +++++++++
 desktop/Executable_officeloader.mk |    1 +
 desktop/Library_deployment.mk      |    1 +
 desktop/Library_deploymentgui.mk   |    9 +++++++++
 5 files changed, 29 insertions(+)

New commits:
commit 04adca77b45cb8d8a3cafaa704d2296c29cfdb60
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 19 10:42:01 2011 +0100

    inch closer to building under windows

diff --git a/desktop/Executable_guiloader.mk b/desktop/Executable_guiloader.mk
index a645b68..d04ee32 100644
--- a/desktop/Executable_guiloader.mk
+++ b/desktop/Executable_guiloader.mk
@@ -38,6 +38,15 @@ $(eval $(call gb_Executable_add_linked_static_libs,guiloader,\
     ooopathutils \
 ))
 
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Executable_add_linked_libs,guiloader,\
+    user32 \
+))
+
+endif
+
+
 $(eval $(call gb_Executable_add_noexception_objects,guiloader,\
     desktop/win32/source/extendloaderenvironment \
     desktop/win32/source/guiloader/genericloader \
diff --git a/desktop/Executable_guistdio.mk b/desktop/Executable_guistdio.mk
index e38efa2..796de55 100644
--- a/desktop/Executable_guistdio.mk
+++ b/desktop/Executable_guistdio.mk
@@ -38,6 +38,15 @@ $(eval $(call gb_Executable_add_defs,guistdio,\
     $(LFS_CFLAGS) \
 ))
 
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Executable_add_linked_libs,guistdio,\
+    user32 \
+))
+
+endif
+
+
 $(eval $(call gb_Executable_add_exception_objects,guistdio,\
     desktop/win32/source/guistdio/guistdio \
 ))
diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
index d10d44f..fa2a7bb 100644
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Executable_add_linked_libs,officeloader,\
     advapi32 \
     shell32 \
     shlwapi \
+    user32 \
 ))
 endif
 
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index dd1c3f3..60cc182 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,deployment,\
     ucbhelper \
     utl \
     xcr \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_use_externals,deployment,\
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index 15de597..0b3c541 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -59,6 +59,15 @@ $(eval $(call gb_Library_add_linked_libs,deploymentgui,\
     vcl \
 ))
 
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Library_add_linked_libs,deploymentgui,\
+    ole32 \
+))
+
+endif
+
+
 $(eval $(call gb_Library_set_componentfile,deploymentgui,desktop/source/deployment/gui/deploymentgui))
 
 $(eval $(call gb_Library_add_exception_objects,deploymentgui,\