2
Fork 0

Renamed function and made safe.

This commit is contained in:
Willem Cazander 2024-07-10 23:00:29 +02:00
parent 8578c8eee5
commit 54dec85047
13 changed files with 88 additions and 81 deletions

View file

@ -2,7 +2,7 @@
GFX_NAME := gfx
GFX_SRC := $(PATH_SRC)/$(GFX_NAME)
GFX_BIN := $(PATH_BIN)/$(GFX_NAME)
GFX_SRC_FILES := $(call rwildcard, $(PATH_SRC)/$(GFX_NAME), *.ge5)
GFX_SRC_FILES := $(call mb_make_call,mb_make_rwildcard, $(PATH_SRC)/$(GFX_NAME), *.ge5)
GFX_BIN_FILES := $(patsubst $(PATH_SRC)/$(GFX_NAME)/%.ge5,$(GFX_BIN)/%.zop,$(GFX_SRC_FILES))
BUILD_HELP += \\n\\t* gfx / test-gfx
@ -19,32 +19,33 @@ BUILD_HELP += \\n\\t* gfx / test-gfx
#
$(GFX_BIN):
$(call mb_mkdir,$(GFX_BIN))
$(call mb_msxhub_get_popcom,$(GFX_BIN))
$(call mb_make_call,mb_os_dir_create,$(GFX_BIN))
$(call mb_make_call,mb_msxhub_get_popcom,$(GFX_BIN))
$(GFX_BIN)/%.zop: $(GFX_SRC)/%.ge5 | $(GFX_BIN)
cp $< $(GFX_BIN)
$(call mb_autoexec_write_default,$(GFX_BIN))
$(call mb_autoexec_append_cmd,$(GFX_BIN),omsxctl fail_after 60 seconds fail_basic_script 126 > NUL)
$(call mb_autoexec_append_echo,$(GFX_BIN),Running basic conversion step)
$(call mb_autoexec_append_cmd,$(GFX_BIN),basic conv.bas)
$(call mb_make_call,mb_autoexec_write_default,$(GFX_BIN))
$(call mb_make_call,mb_autoexec_append_cmd,$(GFX_BIN),omsxctl fail_after 60 seconds fail_basic_script 126 > NUL)
$(call mb_make_call,mb_autoexec_append_echo,$(GFX_BIN),Running basic conversion step)
$(call mb_make_call,mb_autoexec_append_cmd,$(GFX_BIN),basic conv.bas)
@echo "10 SCREEN 5 : SETPAGE 1,1\r" > $(GFX_BIN)/conv.bas;
@echo "20 BLOAD\"$(notdir $<)\",S : COLOR=RESTORE\r" >> $(GFX_BIN)/conv.bas;
@echo "30 BSAVE\"$(notdir $@)\",&H0000,&H7FFF,S\r" >> $(GFX_BIN)/conv.bas;
@echo "40 _SYSTEM(\"pop.bat\")\r" >> $(GFX_BIN)/conv.bas;
@echo -e "10 SCREEN 5 : SETPAGE 1,1\r" > $(GFX_BIN)/conv.bas;
@echo -e "20 BLOAD\"$(notdir $<)\",S : COLOR=RESTORE\r" >> $(GFX_BIN)/conv.bas;
@echo -e "30 BSAVE\"$(notdir $@)\",&H0000,&H7FFF,S\r" >> $(GFX_BIN)/conv.bas;
@echo -e "40 _SYSTEM(\"pop.bat\")\r" >> $(GFX_BIN)/conv.bas;
@echo "\r" > $(GFX_BIN)/pop.bat;
@echo "mode 80 > NUL\r" >> $(GFX_BIN)/pop.bat;
@echo "omsxctl fail_after 120 seconds fail_popcom 126 > NUL\r" >> $(GFX_BIN)/pop.bat;
@echo "popcom $(notdir $@)\r" >> $(GFX_BIN)/pop.bat;
@echo "echo \"All done..................\"\r" >> $(GFX_BIN)/pop.bat;
@echo "omsxctl exit\r" >> $(GFX_BIN)/pop.bat;
@echo -e "\r" > $(GFX_BIN)/pop.bat;
@echo -e "mode 80 > NUL\r" >> $(GFX_BIN)/pop.bat;
@echo -e "omsxctl fail_after 120 seconds fail_popcom 126 > NUL\r" >> $(GFX_BIN)/pop.bat;
@echo -e "popcom $(notdir $@)\r" >> $(GFX_BIN)/pop.bat;
@echo -e "echo \"All done..................\"\r" >> $(GFX_BIN)/pop.bat;
@echo -e "omsxctl exit\r" >> $(GFX_BIN)/pop.bat;
$(call mb_openmsx_dosctl,$(GFX_BIN))
$(call mb_make_call,mb_openmsx_dosctl,$(GFX_BIN))
test-gfx: gfx
$(call mb_msxpipe_run_gui,$(GFX_BIN))
$(call mb_make_call,mb_msxpipe_run_gui,$(GFX_BIN))
gfx: $(GFX_BIN_FILES)
echo All GFX are compressed.