diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-19 10:42:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-19 10:42:01 +0100 |
| commit | 04adca77b45cb8d8a3cafaa704d2296c29cfdb60 (patch) | |
| tree | dd9ace943e91c2b6508c6984c1bf7bc5265ff908 /desktop | |
| parent | 2ed25e1f8c21233cc8f5ee41d449408a7a2f555c (diff) | |
inch closer to building under windows
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Executable_guiloader.mk | 9 | ||||
| -rw-r--r-- | desktop/Executable_guistdio.mk | 9 | ||||
| -rw-r--r-- | desktop/Executable_officeloader.mk | 1 | ||||
| -rw-r--r-- | desktop/Library_deployment.mk | 1 | ||||
| -rw-r--r-- | desktop/Library_deploymentgui.mk | 9 |
5 files changed, 29 insertions, 0 deletions
diff --git a/desktop/Executable_guiloader.mk b/desktop/Executable_guiloader.mk index a645b68f0179..d04ee321cd2a 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 e38efa2be638..796de557b6e6 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 d10d44fd9ca5..fa2a7bbb702e 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 dd1c3f36e946..60cc182c035e 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 15de5974651d..0b3c541cd25b 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,\ |