diff options
| author | Michael Pavone <pavone@retrodev.com> | 2018-02-07 00:07:12 -0800 |
|---|---|---|
| committer | Michael Pavone <pavone@retrodev.com> | 2018-02-07 00:07:12 -0800 |
| commit | a956d5e1f82e98097602e289ac8f02374ea3b5e7 (patch) | |
| tree | 13034bf443f7ca1bdcc9d4a29074f3ebd768c078 /Makefile | |
| parent | 60e74d48cd8c59f412128d98908f2b04b2b07586 (diff) | |
Fix Windows build, added Windows default_font_path implementation
--HG--
branch : nuklear_ui
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -16,6 +16,7 @@ endif 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 @@ else MEM:=mem.o TERMINAL:=terminal.o +FONT:=nuklear_ui/font.o EXE:= ifeq ($(OS),Darwin) @@ -127,7 +129,7 @@ endif 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) \ |