desktop/Executable_loader2.mk | 7 ++++--- solenv/gbuild/platform/windows.mk | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-)
New commits: commit 7dae2882a82711857ae059173c35f01c7302fe2c Author: Caolán McNamara <[email protected]> Date: Mon Sep 19 11:59:42 2011 +0100 progress to link stage of loader2 diff --git a/desktop/Executable_loader2.mk b/desktop/Executable_loader2.mk index 6e34dc6..f399d38 100644 --- a/desktop/Executable_loader2.mk +++ b/desktop/Executable_loader2.mk @@ -38,16 +38,17 @@ $(eval $(call gb_Executable_add_defs,loader2,\ )) endif -$(eval $(call gb_Executable_add_libs,loader2,\ +$(eval $(call gb_Executable_add_linked_libs,loader2,\ advapi32 \ gdi32 \ msi \ shell32 \ + user32 \ )) ifneq ($(COM),GCC) -$(eval $(call gb_Executable_add_libs,loader2,\ - libcmt.lib \ +$(eval $(call gb_Executable_add_linked_libs,loader2,\ + libcmt \ )) endif diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 203ed81..0e44d5c 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -433,10 +433,12 @@ gb_Library_PLAINLIBS_NONE += \ gnu_getopt \ imm32\ kernel32 \ + libcmt \ + mpr \ + msi \ msimg32 \ msvcrt \ msvcprt \ - mpr \ $(gb_Library_win32_OLDNAMES) \ ole32 \ oleaut32 \
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
