diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-21 15:07:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-21 15:11:03 +0100 |
| commit | aba21544bc36cba0cb24778da493ac32c697c3cb (patch) | |
| tree | 011af8a446bf770489708d5d41b62a8f918e5f35 /desktop | |
| parent | 92b54aa8b3e59df2e1c8fdd5137152ccda92d91c (diff) | |
get it to link with msvc at least
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Executable_soffice.bin.mk | 4 | ||||
| -rw-r--r-- | desktop/Executable_soffice.mk | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 7429b862befe..db23a7c6b04f 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 0eca50e148d9..0be0fd373473 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 \ |