summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2011-09-22 15:46:15 +0300
committerTor Lillqvist <tlillqvist@suse.com>2011-09-22 15:46:15 +0300
commit4f3e9f30a0a05a18d39161fda5f271f9b6f2a029 (patch)
treed59bbfbfe5a991cdec071ee828370e7ace6b8858 /desktop
parent8a915ad95fcc1e21f57c7a397fb12a96abc799e6 (diff)
Always link with user32
Diffstat (limited to 'desktop')
-rw-r--r--desktop/Executable_crashrep.com.mk4
-rw-r--r--desktop/Executable_loader2.mk1
-rw-r--r--desktop/Executable_quickstart.mk2
-rw-r--r--desktop/Executable_soffice.bin.mk4
-rw-r--r--desktop/Executable_soffice.mk1
-rw-r--r--desktop/Executable_unopkg.mk4
6 files changed, 0 insertions, 16 deletions
diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index 858ab1094dfa..f62a10270552 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -38,10 +38,6 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\
$(LFS_CFLAGS) \
))
-$(eval $(call gb_Executable_add_linked_libs,crashrep_com,\
- user32 \
-))
-
$(eval $(call gb_Executable_add_exception_objects,crashrep_com,\
desktop/win32/source/guistdio/guistdio \
))
diff --git a/desktop/Executable_loader2.mk b/desktop/Executable_loader2.mk
index a7ebedc2e86c..ee515009fa92 100644
--- a/desktop/Executable_loader2.mk
+++ b/desktop/Executable_loader2.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Executable_add_linked_libs,loader2,\
gdi32 \
msi \
shell32 \
- user32 \
))
ifeq ($(COM),MSC)
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index aa6abd32f80f..6db687018132 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -37,11 +37,9 @@ $(eval $(call gb_Executable_set_include,quickstart,\
$(eval $(call gb_Executable_add_linked_libs,quickstart,\
comdlg32 \
gdi32 \
- kernel32 \
ole32 \
oleaut32 \
shell32 \
- user32 \
))
ifeq ($(COM),GCC)
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index 3aad85f93573..7731aefd6e1e 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -53,10 +53,6 @@ $(eval $(call gb_Executable_add_cobjects,$(sofficebin),\
ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_add_linked_libs,$(sofficebin),\
- user32 \
-))
-
$(eval $(call gb_Executable_add_linked_static_libs,$(sofficebin),\
ooopathutils \
))
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 0be0fd373473..8240ef30d38e 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Executable_add_linked_libs,soffice,\
advapi32 \
shell32 \
shlwapi \
- user32 \
))
$(eval $(call gb_Executable_add_linked_static_libs,soffice,\
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
index f68ec85c27fc..3703f8cd8639 100644
--- a/desktop/Executable_unopkg.mk
+++ b/desktop/Executable_unopkg.mk
@@ -38,10 +38,6 @@ $(eval $(call gb_Executable_add_linked_static_libs,unopkg,\
ooopathutils \
))
-$(eval $(call gb_Executable_add_linked_libs,unopkg,\
- user32 \
-))
-
$(eval $(call gb_Executable_add_noexception_objects,unopkg,\
desktop/win32/source/extendloaderenvironment \
desktop/win32/source/guiloader/genericloader \