diff --git a/ion/src/simulator/Makefile b/ion/src/simulator/Makefile index cab9b80e5..a63c4470a 100644 --- a/ion/src/simulator/Makefile +++ b/ion/src/simulator/Makefile @@ -26,5 +26,8 @@ ion_src += $(addprefix ion/src/simulator/shared/, \ timing.cpp \ ) +assets = background.jpg horizontal_arrow.png vertical_arrow.png round.png small_squircle.png large_squircle.png +assets_paths = $(foreach i,$(assets),ion/src/simulator/assets/$(i)) + include ion/src/simulator/$(TARGET)/Makefile include ion/src/simulator/external/Makefile diff --git a/ion/src/simulator/linux/Makefile b/ion/src/simulator/linux/Makefile index 4b2917d05..763561232 100644 --- a/ion/src/simulator/linux/Makefile +++ b/ion/src/simulator/linux/Makefile @@ -27,10 +27,6 @@ endif LDFLAGS += -ljpeg -assets = background.jpg horizontal_arrow.png vertical_arrow.png round.png small_squircle.png large_squircle.png - -assets_paths = $(foreach i,$(assets),ion/src/simulator/assets/$(i)) - $(eval $(call rule_for, \ LINUX_ASSETS, \ ion/src/simulator/linux/assets.s, \ diff --git a/ion/src/simulator/shared/apple/helpers.mak b/ion/src/simulator/shared/apple/helpers.mak index 53442cd27..9162eeb1c 100644 --- a/ion/src/simulator/shared/apple/helpers.mak +++ b/ion/src/simulator/shared/apple/helpers.mak @@ -23,8 +23,7 @@ $(call simulator_app_resource,$(1)): ion/src/simulator/assets/$(1) | $$$$(@D)/. $(Q) cp $$^ $$@ endef -ASSETS = background.jpg horizontal_arrow.png large_squircle.png round.png small_squircle.png vertical_arrow.png -$(foreach ASSET,$(ASSETS),$(eval $(call rule_for_asset,$(ASSET)))) +$(foreach asset,$(assets),$(eval $(call rule_for_asset,$(asset)))) # Process icons