# HG changeset patch # User Mike Pavone # Date 1389558261 28800 # Node ID b4d360d2e66cc764e4b4a4b1f891410cc7e90015 # Parent 8f23be2db8081026ff2ee6942293ecdc9494a92f Update library paths in makefile diff -r 8f23be2db808 -r b4d360d2e66c Makefile --- a/Makefile Sun Jan 12 12:20:42 2014 -0800 +++ b/Makefile Sun Jan 12 12:24:21 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)