copy bitmaps to /bin

pcawte · Aug 18, 2024 · c4cff60 · c4cff60
1 parent a9c92fe
commit c4cff60
Show file tree

Hide file tree

Showing 242 changed files with 188 additions and 149 deletions.
diff --git a/examples/big-bitmap/bin/big-bitmap.bin b/examples/big-bitmap/bin/big-bitmap.bin
diff --git a/examples/big-bitmap/bin/big-bitmap.map b/examples/big-bitmap/bin/big-bitmap.map
@@ -5,9 +5,9 @@ Section     Base   Top    High   Length
 .fini       04006B 0400F3            88h
 .init.args  0400F3 0400F3             0h
 .init.bss   0400F3 0400FF             Ch
-.text       0400FF 044945          4846h
-.data       044945 044973            2Eh
-.rodata     044973 044D55           3E2h
+.text       0400FF 044976          4877h
+.data       044976 0449A4            2Eh
+.rodata     0449A4 044D86           3E2h
 .init_array 000000 000000             0h
 .ctors      000000 000000             0h
 .dtors      000000 000000             0h
@@ -86,51 +86,51 @@ _vdp_select_bitmap        = 040855
 _vdp_draw_bitmap          = 040878
 _vdp_load_bitmap_file     = 0408AB
 _sys_vars                 = 060000
-_vdu_clear_screen         = 044945
-_vdu_mode                 = 044946
-_vdu_set_logical_scr_dims = 044948
-_vdu_select_bitmap        = 04494C
-_vdu_draw_bitmap          = 044950
-_vdu_load_bitmap          = 044957
-_.str                     = 044973
+_vdu_clear_screen         = 044976
+_vdu_mode                 = 044977
+_vdu_set_logical_scr_dims = 044979
+_vdu_select_bitmap        = 04497D
+_vdu_draw_bitmap          = 044981
+_vdu_load_bitmap          = 044988
+_.str                     = 0449A4
 _errno                    = 060003
 _fclose                   = 0409F8
 _fgetc                    = 040A3C
 __stdio_init              = 040B1B
-_stdin                    = 04495E
-_stdout                   = 044963
-_stderr                   = 044968
+_stdin                    = 04498F
+_stdout                   = 044994
+_stderr                   = 044999
 __file_streams            = 060006
 _fopen                    = 040B6D
 ___fmodeflags             = 040C2E
-_.str                     = 044976
+_.str                     = 0449A7
 _fputc                    = 040C95
 _fput_char                = 040D25
 _fread                    = 040D4C
 _fseek                    = 040E18
-___maptab                 = 04497A
+___maptab                 = 0449AB
 _npf_vpprintf             = 040EC1
-JTI0_0                    = 0449FA
-JTI0_1                    = 044A18
-JTI0_2                    = 044A5D
-JTI0_3                    = 044A7E
-JTI0_4                    = 044A96
-JTI0_5                    = 044AAE
+JTI0_0                    = 044A2B
+JTI0_1                    = 044A49
+JTI0_2                    = 044A8E
+JTI0_3                    = 044AAF
+JTI0_4                    = 044AC7
+JTI0_5                    = 044ADF
 _npf_utoa_rev             = 04262B
 _printf                   = 0426F3
 _vprintf                  = 042712
 _npf_putc_std             = 042732
-_.str                     = 044AC6
-_.str.1                   = 044ACA
-_.str.2                   = 044ACE
+_.str                     = 044AF7
+_.str.1                   = 044AFB
+_.str.2                   = 044AFF
 _scanf                    = 042742
 __strtof_c                = 042767
 __strtod_c                = 042767
 _strtol                   = 042AA4
 _strtoul                  = 042C9D
 _ungetc                   = 042DFA
 __u_scan                  = 042E37
-JTI0_0                    = 044AD2
+JTI0_0                    = 044B03
 _get                      = 043E99
 _unget                    = 043F36
 _argp                     = 06002E
@@ -142,9 +142,9 @@ _fp_fscanf                = 060039
 _bptr                     = 06003C
 _fmt_str                  = 06003F
 __u_sscan                 = 043F55
-JTI0_0                    = 044B35
-_sscan_fsa                = 044B59
-_switch.table._u_sscan    = 044BB3
+JTI0_0                    = 044B66
+_sscan_fsa                = 044B8A
+_switch.table._u_sscan    = 044BE4
 _free                     = 0440DF
 _getchar                  = 04419C
 _isdigit                  = 0441D9
@@ -161,30 +161,30 @@ _mos_fputc                = 044560
 _mos_fread                = 04468D
 _mos_flseek               = 0446C5
 _mos_getfil               = 0446E4
-_outchar                  = 04477A
-_putchar                  = 044781
-_puts                     = 0447B0
-___null_literal_str       = 044CAF
-___end_of_line_str        = 044CB6
-_sbrk                     = 0447DC
-__sbrkbase                = 04496D
-_strchr                   = 0447FA
-_strlen                   = 044817
+_outchar                  = 0447AB
+_putchar                  = 0447B2
+_puts                     = 0447E1
+___null_literal_str       = 044CE0
+___end_of_line_str        = 044CE7
+_sbrk                     = 04480D
+__sbrkbase                = 04499E
+_strchr                   = 04482B
+_strlen                   = 044848
 _strtod                   = 042767
-_toupper                  = 04482C
-_toupper.internal         = 04482F
+_toupper                  = 04485D
+_toupper.internal         = 044860
 __start                   = 040045
 _exit                     = 04006D
 skip._abort               = 0400A5
 _exit.sp                  = 0400A6
 _clear_bss                = 0400F3
-exit_functions            = 044970
-_main                     = 044838
-_.str                     = 044CB8
-_.str.1                   = 044CDA
-_.str.2                   = 044CDF
-_.str.3                   = 044CF8
-_.str.4                   = 044CFE
-_.str.5                   = 044D19
-_str                      = 044D1C
-_str.8                    = 044D35
+exit_functions            = 0449A1
+_main                     = 044869
+_.str                     = 044CE9
+_.str.1                   = 044D0B
+_.str.2                   = 044D10
+_.str.3                   = 044D29
+_.str.4                   = 044D2F
+_.str.5                   = 044D4A
+_str                      = 044D4D
+_str.8                    = 044D66
diff --git a/examples/big-bitmap/bin/img/butterfly_640x427.rgba b/examples/big-bitmap/bin/img/butterfly_640x427.rgba
diff --git a/examples/big-bitmap/bin/img/parrot_180x180.rgba b/examples/big-bitmap/bin/img/parrot_180x180.rgba
diff --git a/examples/big-bitmap/makefile b/examples/big-bitmap/makefile
@@ -13,6 +13,25 @@ BSSHEAP_HIGH = 09FFFF
 CFLAGS = -Wall -Wextra -Oz
 CXXFLAGS = -Wall -Wextra -Oz
 
+IMAGES = $(call NATIVEPATH,$(SRCDIR)/img/*.rgba)
+IMAGES_DEST = $(call NATIVEPATH,$(BINDIR)/img)
+
+DEPS = $(IMAGES)
+
+#Unsure why the copy of this in makefile.mk doesn't cover this already...
+ifeq ($(OS),Windows_NT)
+COPYDIR ?= ( xcopy $1 $2 /S /Q /Y /I /K 1>nul 2>nul || call )
+else
+COPYDIR ?= cp -r $1 $2
+endif
+
 # ----------------------------
 
 include $(shell cedev-config --makefile)
+
+#copy images to /bin
+$(IMAGES): 
+	$(Q)$(call NATIVEMKDR,$(IMAGES_DEST))
+	$(Q)$(call COPYDIR,$(IMAGES),$(IMAGES_DEST))
+
+
diff --git a/examples/sprite/bin/bitmaps/ship00.rgba → examples/sprite/bin/bitmaps/ship/ship00.rgba b/examples/sprite/bin/bitmaps/ship00.rgba → examples/sprite/bin/bitmaps/ship/ship00.rgba
diff --git a/examples/sprite/bin/bitmaps/ship01.rgba → examples/sprite/bin/bitmaps/ship/ship01.rgba b/examples/sprite/bin/bitmaps/ship01.rgba → examples/sprite/bin/bitmaps/ship/ship01.rgba
diff --git a/examples/sprite/bin/bitmaps/ship02.rgba → examples/sprite/bin/bitmaps/ship/ship02.rgba b/examples/sprite/bin/bitmaps/ship02.rgba → examples/sprite/bin/bitmaps/ship/ship02.rgba
diff --git a/examples/sprite/bin/bitmaps/ship03.rgba → examples/sprite/bin/bitmaps/ship/ship03.rgba b/examples/sprite/bin/bitmaps/ship03.rgba → examples/sprite/bin/bitmaps/ship/ship03.rgba
diff --git a/examples/sprite/bin/bitmaps/ship04.rgba → examples/sprite/bin/bitmaps/ship/ship04.rgba b/examples/sprite/bin/bitmaps/ship04.rgba → examples/sprite/bin/bitmaps/ship/ship04.rgba
diff --git a/examples/sprite/bin/bitmaps/ship05.rgba → examples/sprite/bin/bitmaps/ship/ship05.rgba b/examples/sprite/bin/bitmaps/ship05.rgba → examples/sprite/bin/bitmaps/ship/ship05.rgba
diff --git a/examples/sprite/bin/bitmaps/ship06.rgba → examples/sprite/bin/bitmaps/ship/ship06.rgba b/examples/sprite/bin/bitmaps/ship06.rgba → examples/sprite/bin/bitmaps/ship/ship06.rgba
diff --git a/examples/sprite/bin/bitmaps/ship07.rgba → examples/sprite/bin/bitmaps/ship/ship07.rgba b/examples/sprite/bin/bitmaps/ship07.rgba → examples/sprite/bin/bitmaps/ship/ship07.rgba
diff --git a/examples/sprite/bin/bitmaps/ship08.rgba → examples/sprite/bin/bitmaps/ship/ship08.rgba b/examples/sprite/bin/bitmaps/ship08.rgba → examples/sprite/bin/bitmaps/ship/ship08.rgba
diff --git a/examples/sprite/bin/bitmaps/ship09.rgba → examples/sprite/bin/bitmaps/ship/ship09.rgba b/examples/sprite/bin/bitmaps/ship09.rgba → examples/sprite/bin/bitmaps/ship/ship09.rgba
diff --git a/examples/sprite/bin/bitmaps/ship10.rgba → examples/sprite/bin/bitmaps/ship/ship10.rgba b/examples/sprite/bin/bitmaps/ship10.rgba → examples/sprite/bin/bitmaps/ship/ship10.rgba
diff --git a/examples/sprite/bin/bitmaps/ship11.rgba → examples/sprite/bin/bitmaps/ship/ship11.rgba b/examples/sprite/bin/bitmaps/ship11.rgba → examples/sprite/bin/bitmaps/ship/ship11.rgba
diff --git a/examples/sprite/bin/bitmaps/ship12.rgba → examples/sprite/bin/bitmaps/ship/ship12.rgba b/examples/sprite/bin/bitmaps/ship12.rgba → examples/sprite/bin/bitmaps/ship/ship12.rgba
diff --git a/examples/sprite/bin/bitmaps/ship13.rgba → examples/sprite/bin/bitmaps/ship/ship13.rgba b/examples/sprite/bin/bitmaps/ship13.rgba → examples/sprite/bin/bitmaps/ship/ship13.rgba
diff --git a/examples/sprite/bin/bitmaps/ship14.rgba → examples/sprite/bin/bitmaps/ship/ship14.rgba b/examples/sprite/bin/bitmaps/ship14.rgba → examples/sprite/bin/bitmaps/ship/ship14.rgba
diff --git a/examples/sprite/bin/bitmaps/ship15.rgba → examples/sprite/bin/bitmaps/ship/ship15.rgba b/examples/sprite/bin/bitmaps/ship15.rgba → examples/sprite/bin/bitmaps/ship/ship15.rgba
diff --git a/examples/sprite/bin/bitmaps/ship16.rgba → examples/sprite/bin/bitmaps/ship/ship16.rgba b/examples/sprite/bin/bitmaps/ship16.rgba → examples/sprite/bin/bitmaps/ship/ship16.rgba
diff --git a/examples/sprite/bin/bitmaps/ship17.rgba → examples/sprite/bin/bitmaps/ship/ship17.rgba b/examples/sprite/bin/bitmaps/ship17.rgba → examples/sprite/bin/bitmaps/ship/ship17.rgba
diff --git a/examples/sprite/bin/bitmaps/ship18.rgba → examples/sprite/bin/bitmaps/ship/ship18.rgba b/examples/sprite/bin/bitmaps/ship18.rgba → examples/sprite/bin/bitmaps/ship/ship18.rgba
diff --git a/examples/sprite/bin/bitmaps/ship19.rgba → examples/sprite/bin/bitmaps/ship/ship19.rgba b/examples/sprite/bin/bitmaps/ship19.rgba → examples/sprite/bin/bitmaps/ship/ship19.rgba
diff --git a/examples/sprite/bin/bitmaps/ship20.rgba → examples/sprite/bin/bitmaps/ship/ship20.rgba b/examples/sprite/bin/bitmaps/ship20.rgba → examples/sprite/bin/bitmaps/ship/ship20.rgba
diff --git a/examples/sprite/bin/bitmaps/ship21.rgba → examples/sprite/bin/bitmaps/ship/ship21.rgba b/examples/sprite/bin/bitmaps/ship21.rgba → examples/sprite/bin/bitmaps/ship/ship21.rgba
diff --git a/examples/sprite/bin/bitmaps/ship22.rgba → examples/sprite/bin/bitmaps/ship/ship22.rgba b/examples/sprite/bin/bitmaps/ship22.rgba → examples/sprite/bin/bitmaps/ship/ship22.rgba
diff --git a/examples/sprite/bin/bitmaps/ship23.rgba → examples/sprite/bin/bitmaps/ship/ship23.rgba b/examples/sprite/bin/bitmaps/ship23.rgba → examples/sprite/bin/bitmaps/ship/ship23.rgba
diff --git a/examples/sprite/bin/sprite.bin b/examples/sprite/bin/sprite.bin