comparison Makefile @ 1596:437e80a700aa

Initial heuristics for detecting controller types and showing different labels in UI. Modified controller settings view to first display a list of controllers, only showing mapping after selecting controller
author Michael Pavone <pavone@retrodev.com>
date Sun, 22 Jul 2018 17:48:46 -0700
parents 430dd12e4010
children 1fc61c844ec5
comparison
equal deleted inserted replaced
1595:360d5bab199f 1596:437e80a700aa
134 endif 134 endif
135 135
136 Z80OBJS=z80inst.o z80_to_x86.o 136 Z80OBJS=z80inst.o z80_to_x86.o
137 AUDIOOBJS=ym2612.o psg.o wave.o 137 AUDIOOBJS=ym2612.o psg.o wave.o
138 CONFIGOBJS=config.o tern.o util.o paths.o 138 CONFIGOBJS=config.o tern.o util.o paths.o
139 NUKLEAROBJS=$(FONT) nuklear_ui/blastem_nuklear.o nuklear_ui/sfnt.o 139 NUKLEAROBJS=$(FONT) nuklear_ui/blastem_nuklear.o nuklear_ui/sfnt.o controller_info.o
140 RENDEROBJS=render_sdl.o ppm.o 140 RENDEROBJS=render_sdl.o ppm.o
141 LIBZOBJS=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o\ 141 LIBZOBJS=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o\
142 zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o 142 zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
143 143
144 ifdef NOZLIB 144 ifdef NOZLIB