Kaydet (Commit) 0586be91 authored tarafından David Tardon's avatar David Tardon

move dep on solenv_inc to platform

Change-Id: I86db3c7290e22491f41d198dfb53e01f6bbdc50c
üst 203cb5d9
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
# WinResTarget class # WinResTarget class
# defined by platform:
# gb_WinResTarget_WinResTarget_platform
gb_WinResTarget_DEFAULTDEFS := $(gb_RCDEFS) gb_WinResTarget_DEFAULTDEFS := $(gb_RCDEFS)
define gb_WinResTarget_WinResTarget define gb_WinResTarget_WinResTarget
...@@ -17,6 +20,8 @@ $(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLAR ...@@ -17,6 +20,8 @@ $(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLAR
$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE := $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
$(call gb_WinResTarget_get_target,$(1)) : RCFILE := $(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
$(call gb_WinResTarget_WinResTarget_platform,$(1))
ifeq ($(gb_FULLDEPS),$(true)) ifeq ($(gb_FULLDEPS),$(true))
$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS) $(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS)
$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(SRCDIR)/config_$(gb_Side) $(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(SRCDIR)/config_$(gb_Side)
...@@ -33,7 +38,7 @@ $(call gb_WinResTarget_get_dep_target,%) : $(gb_WinResTarget__command_target) ...@@ -33,7 +38,7 @@ $(call gb_WinResTarget_get_dep_target,%) : $(gb_WinResTarget__command_target)
endif endif
$(call gb_WinResTarget_get_target,%) : $(call gb_Package_get_target,solenv_inc) $(call gb_WinResTarget_get_target,%) :
$(call gb_WinResTarget__command,$@,$*,$<) $(call gb_WinResTarget__command,$@,$*,$<)
$(call gb_WinResTarget_get_clean_target,%) : $(call gb_WinResTarget_get_clean_target,%) :
......
...@@ -349,6 +349,8 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -349,6 +349,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(RCFILE) ) $(RCFILE) )
endef endef
gb_WinResTarget_WinResTarget_platform :=
$(eval $(call gb_Helper_make_dep_targets,\ $(eval $(call gb_Helper_make_dep_targets,\
WinResTarget \ WinResTarget \
)) ))
......
...@@ -505,6 +505,11 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -505,6 +505,11 @@ $(call gb_Helper_abbreviate_dirs,\
$(RCFILE) ) $(RCFILE) )
endef endef
define gb_WinResTarget_WinResTarget_platform
$(call gb_WinResTarget_get_target,$(1)) : $(call gb_Package_get_target,solenv_inc)
endef
$(eval $(call gb_Helper_make_dep_targets,\ $(eval $(call gb_Helper_make_dep_targets,\
WinResTarget \ WinResTarget \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment