summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Strba <fridrich.strba@bluewin.ch>2011-10-19 03:18:57 -0600
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-10-19 13:08:32 +0200
commit6ca04869e4234171fb7cffc53f243f2cdcd93fd2 (patch)
treeaa12302f619c5dbd5a0ab3fa9b432d0d7de01228
parent349e80f02be562cd5a863b6a5edda94864f3c92a (diff)
Link manifest to the executables
-rw-r--r--solenv/gbuild/platform/windows.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 058d495a2075..0b88aa442f7d 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -407,7 +407,8 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(LIBS) \
$(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if $(gb_PRODUCT),,oldnames.lib $(if $(filter libcmtd,$(LINKED_LIBS)),,msvcrtd.lib) msvcprtd.lib kernel32.lib) user32.lib) \
$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \
- $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC)
+ $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) \
+ $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $@.manifest ]; then mt.exe $(MTFLAGS) -manifest $@.manifest -outputresource:$@\;1; fi) ; exit $$RC)
endef