# HG changeset patch # User Michael Pavone # Date 1512701838 28800 # Node ID e9e1910eb2f51e35f818780a5aaf7c28c01bf404 # Parent 8be6ea9193005858c8ac30594bc8937e21b7baeb Move paths.o to CONFIGOBJS since config.c uses path_append now diff -r 8be6ea919300 -r e9e1910eb2f5 Makefile --- a/Makefile Wed Dec 06 19:29:16 2017 -0800 +++ b/Makefile Thu Dec 07 18:57:18 2017 -0800 @@ -126,12 +126,12 @@ Z80OBJS=z80inst.o z80_to_x86.o AUDIOOBJS=ym2612.o psg.o wave.o -CONFIGOBJS=config.o tern.o util.o +CONFIGOBJS=config.o tern.o util.o paths.o NUKLEAROBJS=nuklear_ui/font.o nuklear_ui/blastem_nuklear.o MAINOBJS=blastem.o system.o genesis.o debug.o gdb_remote.o vdp.o render_sdl.o ppm.o io.o romdb.o hash.o menu.o xband.o \ realtec.o i2c.o nor.o sega_mapper.o multi_game.o serialize.o $(TERMINAL) $(CONFIGOBJS) gst.o $(M68KOBJS) \ - $(TRANSOBJS) $(AUDIOOBJS) paths.o saves.o + $(TRANSOBJS) $(AUDIOOBJS) saves.o ifdef NONUKLEAR CFLAGS+= -DDISABLE_NUKLEAR