diff options
| author | David Tardon <dtardon@redhat.com> | 2011-09-27 19:54:42 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-09-27 20:01:48 +0200 |
| commit | 2e2dcefb5fde4672f1fef96a3be6a046c3bad3bb (patch) | |
| tree | 453f5ad5ced68c078e1a6de002e7143498e57c05 /solenv | |
| parent | edb760e625b899ac374b7f85ebe725389a02ef8a (diff) | |
make WinResTarget's name independent of LinkTarget
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Library.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/platform/winmingw.mk | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index a3bcc8dd4bdd..baa8d9e8bd91 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -60,7 +60,7 @@ $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk endif $(call gb_Library_get_target,$(1)) : AUXTARGETS := $(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1))) -$(call gb_Library_add_default_nativeres,$(1),default) +$(call gb_Library_add_default_nativeres,$(1),$(1)/default) endef diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index e91d5b0ecb43..e2ba1a4bce74 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -518,22 +518,22 @@ $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_g endef define gb_Library_add_default_nativeres -$(call gb_WinResTarget_WinResTarget_init,$(1)/$(2)) -$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo) -$(call gb_WinResTarget_set_defs,$(1)/$(2),\ +$(call gb_WinResTarget_WinResTarget_init,$(2)) +$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo) +$(call gb_WinResTarget_set_defs,$(2),\ $$(DEFS) \ -DADDITIONAL_VERINFO1 \ -DADDITIONAL_VERINFO2 \ -DADDITIONAL_VERINFO3 \ ) $(call gb_Library_add_nativeres,$(1),$(2)) -$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2)) +$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2)) endef define gb_LinkTarget_add_nativeres -$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(1)/$(2)) -$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2)) +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) +$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(2)) endef diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index ceb91d24a66c..50a5a7e08489 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -519,22 +519,22 @@ $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1)) endef define gb_Library_add_default_nativeres -$(call gb_WinResTarget_WinResTarget_init,$(1)/$(2)) -$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo) -$(call gb_WinResTarget_set_defs,$(1)/$(2),\ +$(call gb_WinResTarget_WinResTarget_init,$(2)) +$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo) +$(call gb_WinResTarget_set_defs,$(2),\ $$(DEFS) \ -DADDITIONAL_VERINFO1 \ -DADDITIONAL_VERINFO2 \ -DADDITIONAL_VERINFO3 \ ) $(call gb_Library_add_nativeres,$(1),$(2)) -$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2)) +$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2)) endef define gb_LinkTarget_add_nativeres -$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(1)/$(2)) -$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2)) +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) +$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(2)) endef |