UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion] Change name of variable in Makefile

Browse Source
This commit is contained in:
Émilie Feral
2020-09-18 17:30:24 +02:00
committed by EmilieNumworks
parent 308b321ead
commit 7535abc298
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ion/src/simulator/Makefile
View File

@@ -26,8 +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))
ion_simulator_assets = background.jpg horizontal_arrow.png vertical_arrow.png round.png small_squircle.png large_squircle.png
ion_simulator_assets_paths = $(add_prefix ion/src/simulator/assets/,$(ion_simulator_assets))
include ion/src/simulator/$(TARGET)/Makefile
include ion/src/simulator/external/Makefile

8
ion/src/simulator/linux/Makefile
View File

@@ -30,8 +30,8 @@ LDFLAGS += -ljpeg
$(eval $(call rule_for, \
LINUX_ASSETS, \
ion/src/simulator/linux/assets.s, \
$(assets_paths), \
$$(PYTHON) ion/src/simulator/linux/assets.py --files $(assets) --implementation $$@, \
$(ion_simulator_assets_paths), \
$$(PYTHON) ion/src/simulator/linux/assets.py --files $(ion_simulator_assets) --implementation $$@, \
global \
))
@@ -41,7 +41,7 @@ SFLAGS += -I$(BUILD_DIR)
$(eval $(call rule_for, \
LINUX_ASSETS, \
ion/src/simulator/linux/images.h, \
$(assets_paths), \
$$(PYTHON) ion/src/simulator/linux/assets.py --files $(assets) --header $$@, \
$(ion_simulator_assets_paths), \
$$(PYTHON) ion/src/simulator/linux/assets.py --files $(ion_simulator_assets) --header $$@, \
global \
))

2
ion/src/simulator/shared/apple/helpers.mak
View File

@@ -23,7 +23,7 @@ $(call simulator_app_resource,$(1)): ion/src/simulator/assets/$(1) | $$$$(@D)/.
$(Q) cp $$^ $$@
endef
$(foreach asset,$(assets),$(eval $(call rule_for_asset,$(asset))))
$(foreach asset,$(ion_simulator_assets),$(eval $(call rule_for_asset,$(asset))))
# Process icons

8
ion/src/simulator/windows/Makefile
View File

@@ -27,16 +27,16 @@ LDFLAGS += -lgdiplus
$(eval $(call rule_for, \
WINDOWS_ASSETS, \
ion/src/simulator/windows/resources.h, \
$(assets_paths), \
$$(PYTHON) ion/src/simulator/windows/assets.py --files $$^ --header-resource-rc $$@, \
$(ion_simulator_assets_paths), \
$$(PYTHON) ion/src/simulator/windows/assets.py --files $(ion_simulator_assets) --header-resource-rc $$@, \
global \
))
$(eval $(call rule_for, \
WINDOWS_ASSETS, \
ion/src/simulator/windows/resource_mapping.h, \
$(assets_paths), \
$$(PYTHON) ion/src/simulator/windows/assets.py --files $$^ --header-resource-mapping $$@, \
$(ion_simulator_assets_paths), \
$$(PYTHON) ion/src/simulator/windows/assets.py --files $(ion_simulator_assets) --header-resource-mapping $$@, \
global \
))