Added old gfx and converted to generated autoexec.bat's

.gitignore

@@ -12,7 +12,7 @@ build/local.inc.mk
 Makelocal.mk
 
 # IDE ignores
-.project
+.settings
 .vs/
 
 # File ignores

.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>original-dome</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

src/dist-run/0module.mk

@@ -2,16 +2,13 @@
 DIST_RUN_NAME		:= dist-run
 DIST_RUN_BIN		:= $(PATH_BIN)/$(DIST_RUN_NAME)
 DIST_RUN_SRC		:= $(PATH_SRC)/$(DIST_RUN_NAME)
-DIST_RUN_INC		:= autoexec.bat init.com dome.000
+DIST_RUN_INC		:= init.com dome.000
 DIST_RUN_INC_BIN 	:= $(patsubst %,$(DIST_RUN_BIN)/%,$(DIST_RUN_INC))
 BUILD_HELP          += \\n\\t* $(DIST_RUN_NAME)
 
 $(DIST_RUN_BIN):
 	$(call mb_mkdir,$(DIST_RUN_BIN))
 
-$(DIST_RUN_BIN)/autoexec.bat: $(DIST_RUN_SRC)/autoexec.bat | $(DIST_RUN_BIN)
-	unix2dos -n $< $@;
-
 $(DIST_RUN_BIN)/init.com: bin/init/init.com | $(DIST_RUN_BIN)
 	cp $< $@;
 $(DIST_RUN_BIN)/dome.000: bin/domelib/dome.000 | $(DIST_RUN_BIN)
@@ -20,7 +17,8 @@ $(DIST_RUN_BIN)/dome.000: bin/domelib/dome.000 | $(DIST_RUN_BIN)
 	cp bin/domelib/*.dat $(DIST_RUN_BIN);
 	cp bin/domelib/*.00* $(DIST_RUN_BIN);
 	echo "=== Overwrite org zop gfx until working..."
-	cp src/gfx/old/*.zop $(DIST_RUN_BIN);
+	cp src/gfx/org/*.zop $(DIST_RUN_BIN);
 
 $(DIST_RUN_NAME): $(DIST_RUN_INC_BIN)
+	$(call mb_autoexec_open_gui_cmd,$(DIST_RUN_BIN),init)
 	$(call mb_openmsx_dos2,$(DIST_RUN_BIN))

src/dist-run/autoexec.bat

@@ -1,10 +0,0 @@
-mode 80
-echo === Set fail_after
-omsxctl fail_after 300 realtime dist_run 4
-echo === Set renderer
-omsxctl unset renderer
-echo === Enable throttling
-omsxctl set throttle on
-echo === Start program
-init 
-//omsxctl exit

src/domelib/0module.mk

@@ -15,9 +15,6 @@ BUILD_HELP      += \\n\\t* $(DOMELIB_OUT)
 $(DOMELIB_BIN):
 	$(call mb_mkdir,$(DOMELIB_BIN))
 
-$(DOMELIB_BIN)/autoexec.bat: $(DOMELIB_SRC)/autoexec.bat | $(DOMELIB_BIN)
-	unix2dos -n $< $@;
-
 $(DOMELIB_BIN)/bios.dat: $(PATH_BIN)/bios/bios.dat | $(DOMELIB_BIN)
 	cp $< $@;
 $(DOMELIB_BIN)/dome.dat: $(PATH_BIN)/dome/dome.dat | $(DOMELIB_BIN)
@@ -36,7 +33,12 @@ $(DOMELIB_BIN)/menu.dat: $(PATH_BIN)/menu/menu.dat | $(DOMELIB_BIN)
 $(DOMELIB_BIN)/mmenu.dat: $(PATH_BIN)/mmenu/mmenu.dat | $(DOMELIB_BIN)
 	cp $< $@;
 	
-$(DOMELIB_OUT): $(DOMELIB_BIN)/autoexec.bat \
-$(DOMELIB_BIN)/bios.dat $(DOMELIB_BIN)/dome.dat $(DOMELIB_BIN)/loader.dat $(DOMELIB_BIN)/makelib.com $(DOMELIB_BIN)/menu.dat $(DOMELIB_BIN)/mmenu.dat
-	cp $(DOMELIB_BIN)/autoexec.bat $(DOMELIB_OUT)
+$(DOMELIB_OUT): $(DOMELIB_BIN)/bios.dat $(DOMELIB_BIN)/dome.dat $(DOMELIB_BIN)/loader.dat $(DOMELIB_BIN)/makelib.com $(DOMELIB_BIN)/menu.dat $(DOMELIB_BIN)/mmenu.dat
+	@echo === Generating autoexec.bat for command
+	$(call mb_autoexec_write_default,$(DOMELIB_BIN))
+	$(call mb_autoexec_append_echo,$(DOMELIB_BIN),Setup timeout for makelib)
+	$(call mb_autoexec_append_cmd,$(DOMELIB_BIN),omsxctl fail_after 120 seconds fail_makelib 126)
+	$(call mb_autoexec_append_echo,$(DOMELIB_BIN),Running command makelib)
+	$(call mb_autoexec_append_cmd,$(DOMELIB_BIN),makelib)
+	$(call mb_autoexec_append_exit,$(DOMELIB_BIN))
 	$(call mb_openmsx_dos2, $(DOMELIB_BIN))

src/domelib/autoexec.bat

@@ -1,7 +0,0 @@
-mode 80
-echo === Set new fail watchdog
-omsxctl fail_after 120
-echo === Start program
-makelib
-echo === End program
-omsxctl exit

src/gfx/0module.mk

@@ -6,27 +6,34 @@ GFX_SRC_FILES	:= $(call 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
 
+# TODO: add unittot.ge5
+#
+#10 SCREEN 5 : SETPAGE 1,1
+#20 BLOAD"units.ge5",S : COLOR=RESTORE
+#30 SETPAGE 2,2
+#40 BLOAD"2row.ge5",S
+#50 SETPAGE 1,1
+#60 COPY (0,0)-(256,32),2 TO (0,208),1
+#70 BSAVE"unit.pop",&H8000,&HFFFF,S
+#80 _SYSTEM("pop.bat")
+#
 
 $(GFX_BIN):
 	$(call mb_mkdir,$(GFX_BIN))
-
-# TODO: add unittot.ge5
-
-#1 SCREEN 5 : SETPAGE 1,1
-#2 BLOAD"units.ge5",S : COLOR=RESTORE
-#3 SETPAGE 2,2
-#4 BLOAD"2row.ge5",S
-#5 SETPAGE 1,1
-#6 COPY (0,0)-(256,32),2 TO (0,208),1
-#7 BSAVE"unit.pop",&H8000,&HFFFF,S
-
-$(GFX_BIN)/%.zop: $(GFX_SRC)/%.ge5 | $(GFX_BIN)
-	cp $< $@;
-	unix2dos -n $(GFX_SRC)/autoexec.bat $(GFX_BIN)/autoexec.bat;
-	@echo "basic conv.bas\r" >> $(GFX_BIN)/autoexec.bat;
+	
+$(GFX_BIN)/popcom.com: $(GFX_BIN)
+	test -f $(GFX_BIN)/popcom.com || $(CMD_WGET) -O $(GFX_BIN)/popcom.com https://msxhub.com/api/POPCOM/1.00-1/get/POPCOM/popcom.com
+	
+$(GFX_BIN)/%.zop: $(GFX_SRC)/%.ge5 | $(GFX_BIN) $(GFX_BIN)/popcom.com
+	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)
+	#add-gui-debug; $(call mb_autoexec_append_cmd,$(GFX_BIN),omsxctl set renderer SDL > NUL)
+	$(call mb_autoexec_append_echo,$(GFX_BIN),Running basic conversion step)
+	$(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 "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;
 	
@@ -35,17 +42,14 @@ $(GFX_BIN)/%.zop: $(GFX_SRC)/%.ge5 | $(GFX_BIN)
 	@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;
+	
 	$(call mb_openmsx_dos2, $(GFX_BIN))
-	ls -la $(GFX_BIN)/$(notdir $@);
-	dd if=$(GFX_BIN)/$(notdir $@) of=$(GFX_BIN)/$(notdir $@).out bs=1 skip=10;
-	cp $(GFX_BIN)/$(notdir $@).out $(GFX_BIN)/$(notdir $@);
 
 test-gfx: gfx
-	unix2dos -n $(GFX_SRC)/autoexec.bat $(GFX_BIN)/autoexec.bat;
-	echo "omsxctl set renderer SDL\r" >> $(GFX_BIN)/autoexec.bat;
-	echo "omsxctl set throttle on\r" >> $(GFX_BIN)/autoexec.bat;
-	echo "omsxctl set speed 200\r" >> $(GFX_BIN)/autoexec.bat;
-	$(call mb_openmsx_dos2, $(GFX_BIN))
+	$(call mb_autoexec_open_gui,$(GFX_BIN))
+	$(call mb_autoexec_append_echo,$(GFX_BIN),Selecting 7Mhz speed.)
+	$(call mb_autoexec_append_cmd,$(GFX_BIN),omsxctl set speed 200 > NUL)
+	$(call mb_openmsx_dos2,$(GFX_BIN))
 
 gfx: $(GFX_BIN_FILES)
 	echo All GFX are compressed.

src/gfx/autoexec.bat

@@ -1,4 +0,0 @@
-mode 80
-echo === Test fail_after
-omsxctl fail_after 300 seconds build_gfx
-echo === Start program

src/mmenu/.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>udome</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>