comparison Makefile @ 1495:e9e1910eb2f5 nuklear_ui

Move paths.o to CONFIGOBJS since config.c uses path_append now
author Michael Pavone <pavone@retrodev.com>
date Thu, 07 Dec 2017 18:57:18 -0800
parents 001120e91fed
children 224725e8a3a8
comparison
equal deleted inserted replaced
1494:8be6ea919300 1495:e9e1910eb2f5
124 endif 124 endif
125 endif 125 endif
126 126
127 Z80OBJS=z80inst.o z80_to_x86.o 127 Z80OBJS=z80inst.o z80_to_x86.o
128 AUDIOOBJS=ym2612.o psg.o wave.o 128 AUDIOOBJS=ym2612.o psg.o wave.o
129 CONFIGOBJS=config.o tern.o util.o 129 CONFIGOBJS=config.o tern.o util.o paths.o
130 NUKLEAROBJS=nuklear_ui/font.o nuklear_ui/blastem_nuklear.o 130 NUKLEAROBJS=nuklear_ui/font.o nuklear_ui/blastem_nuklear.o
131 131
132 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 \ 132 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 \
133 realtec.o i2c.o nor.o sega_mapper.o multi_game.o serialize.o $(TERMINAL) $(CONFIGOBJS) gst.o $(M68KOBJS) \ 133 realtec.o i2c.o nor.o sega_mapper.o multi_game.o serialize.o $(TERMINAL) $(CONFIGOBJS) gst.o $(M68KOBJS) \
134 $(TRANSOBJS) $(AUDIOOBJS) paths.o saves.o 134 $(TRANSOBJS) $(AUDIOOBJS) saves.o
135 135
136 ifdef NONUKLEAR 136 ifdef NONUKLEAR
137 CFLAGS+= -DDISABLE_NUKLEAR 137 CFLAGS+= -DDISABLE_NUKLEAR
138 else 138 else
139 MAINOBJS+= $(NUKLEAROBJS) 139 MAINOBJS+= $(NUKLEAROBJS)