Mercurial > repos > blastem
diff Makefile @ 1524:b96f9fae757f nuklear_ui
Fix Windows build, added Windows default_font_path implementation
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Wed, 07 Feb 2018 00:07:12 -0800 |
parents | 63659fb92db4 |
children | 4f6e8acd7b6a |
line wrap: on
line diff
--- a/Makefile Tue Feb 06 22:44:11 2018 -0800 +++ b/Makefile Wed Feb 07 00:07:12 2018 -0800 @@ -16,6 +16,7 @@ MEM:=mem_win.o TERMINAL:=terminal_win.o +FONT:=nuklear_ui/font_win.o EXE:=.exe CC:=i686-w64-mingw32-gcc-win32 CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -I"$(SDL2_PREFIX)/include/SDL2" -I"$(GLEW_PREFIX)/include" -DGLEW_STATIC @@ -26,6 +27,7 @@ MEM:=mem.o TERMINAL:=terminal.o +FONT:=nuklear_ui/font.o EXE:= ifeq ($(OS),Darwin) @@ -127,7 +129,7 @@ Z80OBJS=z80inst.o z80_to_x86.o AUDIOOBJS=ym2612.o psg.o wave.o CONFIGOBJS=config.o tern.o util.o paths.o -NUKLEAROBJS=nuklear_ui/font.o nuklear_ui/blastem_nuklear.o +NUKLEAROBJS=$(FONT) 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) \