diff options
| author | David Tardon <dtardon@redhat.com> | 2011-09-26 12:46:04 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-09-26 12:46:04 +0200 |
| commit | 096397e9da806aef68812c40ddc02075c296ba72 (patch) | |
| tree | 6a83776cdc1aafb3c38d6dc560acfa1e2e12fa46 /solenv | |
| parent | e073da6d6b06d358466ceebdb120c7f1ea01ec29 (diff) | |
allow adding native windows res. files for executables too
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Executable.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/platform/winmingw.mk | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 198c1f89d6bd..786e7422c4ff 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -107,6 +107,7 @@ $(eval $(foreach method,\ add_package_headers \ add_sdi_headers \ add_precompiled_header \ + add_nativeres \ ,\ $(call gb_Executable_forward_to_Linktarget,$(method))\ )) diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index dd6c1ccf1dae..a3bcc8dd4bdd 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -150,6 +150,7 @@ $(eval $(foreach method,\ add_sdi_headers \ add_precompiled_header \ export_objects_list \ + add_nativeres \ ,\ $(call gb_Library__forward_to_Linktarget,$(method))\ )) diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 3ada7c3a0984..e91d5b0ecb43 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -531,9 +531,9 @@ $(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_targ endef -define gb_Library_add_nativeres -$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : $(call gb_WinResTarget_get_target,$(1)/$(2)) -$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2)) +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)) endef diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index 3b4b856fee2d..bceac5ec8341 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -532,7 +532,7 @@ $(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_targ endef -define gb_Library_add_nativeres +define gb_LinkTarget_add_nativeres $(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : $(call gb_WinResTarget_get_target,$(1)/$(2)) $(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2)) |