Mercurial > repos > genjam1
changeset 6:16399c067bf1
merge
| author | William Morgan <bill@mrgn.org> |
|---|---|
| date | Sun, 12 Jan 2014 15:16:03 -0800 |
| parents | 11fbaecc6c5e (current diff) d73f53857e5f (diff) |
| children | 2fde9ab7308f |
| files | |
| diffstat | 2 files changed, 31 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Jan 12 13:43:51 2014 -0800 +++ b/Makefile Sun Jan 12 15:16:03 2014 -0800 @@ -20,11 +20,11 @@ HWCCFLAGS = $(OPTION) -m68000 -Wall -O1 -c -fomit-frame-pointer Z80FLAGS = -vb2 ASFLAGS = -m68000 --register-prefix-optional -#LIBS = -L$(GENDEV)/m68k-elf/lib -L$(GENDEV)/m68k-elf/lib/gcc/m68k-elf/4.5.2 -L$(GENDEV)/m68k-elf/m68k-elf/lib -lmd -lc -lgcc -lnosys -lm -LIBS = -L$(GENDEV)/m68k-elf/lib -L$(GENDEV)/m68k-elf/lib/gcc/m68k-elf/4.5.2 -L$(GENDEV)/m68k-elf/m68k-elf/lib -lmd -lnosys -LINKFLAGS = -T $(GENDEV)/ldscripts/sgdk.ld -nostdlib -SCDLINKFLAGS = -T scd/mdcd.ld -nostdlib -ARCHIVES = $(GENDEV)/m68k-elf/lib/libmd.a $(GENDEV)/m68k-elf/lib/gcc/m68k-elf/4.5.2/libgcc.a +#LIBS = -L$(GENDEV)/m68k-elf/lib -L$(GENDEV)/m68k-elf/lib/gcc/m68k-elf/4.5.2 -L$(GENDEV)/m68k-elf/m68k-elf/lib -lmd -lc -lgcc -lnosys -lm +LIBS = -L$(GENDEV)/m68k-elf/lib -L$(GENDEV)/m68k-elf/lib/gcc/m68k-elf/4.8.2 -L$(GENDEV)/m68k-elf/m68k-elf/lib -lmd -lnosys +LINKFLAGS = -T $(GENDEV)/ldscripts/sgdk.ld -nostdlib +SCDLINKFLAGS = -T scd/mdcd.ld -nostdlib +ARCHIVES = $(GENDEV)/m68k-elf/lib/libmd.a $(GENDEV)/m68k-elf/lib/gcc/m68k-elf/4.8.2/libgcc.a RESOURCES= BOOT_RESOURCES= @@ -74,12 +74,12 @@ OBJS = $(RESOURCES) -all: out.bin +all: out.bin boot/sega.o: boot/rom_head.bin $(AS) $(ASFLAGS) boot/sega.s -o $@ -scd/segacd.o: +scd/segacd.o: $(AS) $(ASFLAGS) scd/segacd.s -o $@ @@ -89,9 +89,9 @@ # $(NM) -n -S -t x out.elf_scd > out.nm $(OBJC) -O binary out.elf_scd out.bin - $(SIZEBND) out.bin -sizealign 131072 + $(SIZEBND) out.bin -sizealign 131072 $(OBJC) -O binary out.elf_scd $(SCD_LOADER)/_filesystem/M_INIT.PRG - $(SIZEBND) $(SCD_LOADER)/_filesystem/M_INIT.PRG -sizealign 131072 + $(SIZEBND) $(SCD_LOADER)/_filesystem/M_INIT.PRG -sizealign 131072 $(MKISOFS) -iso-level 1 -o $(SCD_LOADER)/filesystem.img -pad $(SCD_LOADER)/_filesystem tail -c +32769 $(SCD_LOADER)/filesystem.img > $(SCD_LOADER)/filesystem.bin $(RM) -f $(SCD_LOADER)/filesystem.img @@ -118,7 +118,7 @@ %.o: %.c $(CC) $(CCFLAGS) $(INCS) -c $< -o $@ -%.o: %.s +%.o: %.s $(AS) $(ASFLAGS) $< -o $@ %.s: %.bmp @@ -151,7 +151,7 @@ %.s: %.eif $(BINTOS) -align 256 $< -%.s: %.vgm +%.s: %.vgm $(BINTOS) -align 256 $< %.s: %.raw @@ -165,7 +165,7 @@ boot/rom_head.bin: boot/rom_head.o $(LD) $(LINKFLAGS) --oformat binary -o $@ $< - + clean: $(RM) $(RESOURCES)
--- a/src/main.c Sun Jan 12 13:43:51 2014 -0800 +++ b/src/main.c Sun Jan 12 15:16:03 2014 -0800 @@ -1,12 +1,31 @@ #include <genesis.h> #include "creep.h" +u16 tilemap[40*28]; + int main(void) { + u16 i; + VDP_setPlanSize(64, 32); + for (i = 6; i < 40*28; i += 4) + if ((i > 80 || i & 4) && (i < 40*26 || !(i & 4)) && i % 40 < 38) + { + tilemap[i] = 'O' + TILE_FONTINDEX; + tilemap[i+1] = 'O' + TILE_FONTINDEX; + } + + tilemap[38 + 13*40] = TILE_ATTR_FULL(1, 0, 0, 0, 'G' + TILE_FONTINDEX); + tilemap[39 + 13*40] = TILE_ATTR_FULL(1, 0, 0, 0, 'G' + TILE_FONTINDEX); + tilemap[38 + 14*40] = TILE_ATTR_FULL(1, 0, 0, 0, 'G' + TILE_FONTINDEX); + tilemap[39 + 14*40] = TILE_ATTR_FULL(1, 0, 0, 0, 'G' + TILE_FONTINDEX); for (;;) { VDP_waitVSync(); VDP_updateSprites(); + for (i = 0; i < 28; i++) + { + VDP_setTileMapRectByIndex(VDP_PLAN_B, tilemap + i*40, i*64, 40, 0); + } } return 0; }