diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-09-19 11:59:42 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-19 11:59:42 +0100 |
commit | 7dae2882a82711857ae059173c35f01c7302fe2c (patch) | |
tree | 1b95391dbe5f0c46099e06e4601f624c80bb7ee9 | |
parent | despite its name, it appears not to be a gui app (diff) | |
download | core-7dae2882a82711857ae059173c35f01c7302fe2c.tar.gz core-7dae2882a82711857ae059173c35f01c7302fe2c.zip |
progress to link stage of loader2
-rw-r--r-- | desktop/Executable_loader2.mk | 7 | ||||
-rw-r--r-- | solenv/gbuild/platform/windows.mk | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/desktop/Executable_loader2.mk b/desktop/Executable_loader2.mk index 6e34dc69b1e8..f399d3847876 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 203ed8120fcf..0e44d5c446c8 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 \ |