diff options
| author | David Tardon <dtardon@redhat.com> | 2011-09-27 20:00:22 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-09-27 20:01:49 +0200 |
| commit | b6d8251eee90b7e24ebb3f8452eff36a507e6d91 (patch) | |
| tree | 04db97f80c18554f6cf15f277f38f2eeccf68999 | |
| parent | 2e2dcefb5fde4672f1fef96a3be6a046c3bad3bb (diff) | |
move windows-only call into platform/win*
| -rw-r--r-- | solenv/gbuild/Library.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/winmingw.mk | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index baa8d9e8bd91..10bee87f89a1 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -60,7 +60,6 @@ $$(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),$(1)/default) endef diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index e2ba1a4bce74..901b57af7a19 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -508,6 +508,8 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += \ $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \ $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \ +$(call gb_Library_add_default_nativeres,$(1),$(1)/default) + endif $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1)) diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index 50a5a7e08489..d4f475c27486 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -516,6 +516,8 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1)) +$(call gb_Library_add_default_nativeres,$(1),$(1)/default) + endef define gb_Library_add_default_nativeres |