comparison 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
comparison
equal deleted inserted replaced
1523:c416ace65ff1 1524:b96f9fae757f
14 GLEW32S_LIB:=$(GLEW_PREFIX)/lib/Release/Win32/glew32s.lib 14 GLEW32S_LIB:=$(GLEW_PREFIX)/lib/Release/Win32/glew32s.lib
15 endif 15 endif
16 16
17 MEM:=mem_win.o 17 MEM:=mem_win.o
18 TERMINAL:=terminal_win.o 18 TERMINAL:=terminal_win.o
19 FONT:=nuklear_ui/font_win.o
19 EXE:=.exe 20 EXE:=.exe
20 CC:=i686-w64-mingw32-gcc-win32 21 CC:=i686-w64-mingw32-gcc-win32
21 CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -I"$(SDL2_PREFIX)/include/SDL2" -I"$(GLEW_PREFIX)/include" -DGLEW_STATIC 22 CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -I"$(SDL2_PREFIX)/include/SDL2" -I"$(GLEW_PREFIX)/include" -DGLEW_STATIC
22 LDFLAGS:= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lm -lmingw32 -lSDL2main -lSDL2 -lws2_32 -lopengl32 -lglu32 -mwindows 23 LDFLAGS:= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lm -lmingw32 -lSDL2main -lSDL2 -lws2_32 -lopengl32 -lglu32 -mwindows
23 CPU:=i686 24 CPU:=i686
24 25
25 else 26 else
26 27
27 MEM:=mem.o 28 MEM:=mem.o
28 TERMINAL:=terminal.o 29 TERMINAL:=terminal.o
30 FONT:=nuklear_ui/font.o
29 EXE:= 31 EXE:=
30 32
31 ifeq ($(OS),Darwin) 33 ifeq ($(OS),Darwin)
32 LIBS=sdl2 glew 34 LIBS=sdl2 glew
33 else 35 else
125 endif 127 endif
126 128
127 Z80OBJS=z80inst.o z80_to_x86.o 129 Z80OBJS=z80inst.o z80_to_x86.o
128 AUDIOOBJS=ym2612.o psg.o wave.o 130 AUDIOOBJS=ym2612.o psg.o wave.o
129 CONFIGOBJS=config.o tern.o util.o paths.o 131 CONFIGOBJS=config.o tern.o util.o paths.o
130 NUKLEAROBJS=nuklear_ui/font.o nuklear_ui/blastem_nuklear.o 132 NUKLEAROBJS=$(FONT) nuklear_ui/blastem_nuklear.o
131 133
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 \ 134 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) \ 135 realtec.o i2c.o nor.o sega_mapper.o multi_game.o serialize.o $(TERMINAL) $(CONFIGOBJS) gst.o $(M68KOBJS) \
134 $(TRANSOBJS) $(AUDIOOBJS) saves.o 136 $(TRANSOBJS) $(AUDIOOBJS) saves.o
135 137