summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-05-02 10:55:14 +0200
committerDavid Tardon <dtardon@redhat.com>2012-05-02 10:56:23 +0200
commit602f251d6c5f1f5551cdeb4c70abe0c49834d2c7 (patch)
tree884bf73903b377cbd7bf1f6a9f2da07046cb7ef2
parent947244c188dabe7a1799254c9e9c58ddb2eccf98 (diff)
fdo#49183 link resources to executables
Change-Id: I5dd5cec5d4c66a65154d965c8c707f8a585880d6
-rw-r--r--solenv/gbuild/platform/WNT_INTEL_GCC.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index e283f155f640..155d97b419ea 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -140,6 +140,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+ $(NATIVERES) \
$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
$(LIBS) \
@@ -159,6 +160,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+ $(NATIVERES) \
$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
$(LIBS) \
@@ -387,7 +389,7 @@ endef
# WinResTarget class
-gb_WinResTarget_POSTFIX :=.res
+gb_WinResTarget_POSTFIX :=.o
define gb_WinResTarget__command
$(call gb_Output_announce,$(2),$(true),RES,3)