summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile22
1 files changed, 16 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index af0bd04..0671aff 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
@@ -65,7 +67,7 @@ endif #PORTABLE
endif #Windows
ifdef DEBUG
-OPT:=-ggdb -Og
+OPT:=-g3 -Og
else
ifdef NOLTO
OPT:=-O2
@@ -86,6 +88,7 @@ LDFLAGS+= -Wl,--no-as-needed -lprofiler -Wl,--as-needed
endif
ifdef NOGL
CFLAGS+= -DDISABLE_OPENGL
+NONUKLEAR:=1
endif
ifdef M68030
@@ -125,14 +128,21 @@ endif
Z80OBJS=z80inst.o z80_to_x86.o
AUDIOOBJS=ym2612.o psg.o wave.o
-CONFIGOBJS=config.o tern.o util.o
+CONFIGOBJS=config.o tern.o util.o paths.o
+NUKLEAROBJS=$(FONT) nuklear_ui/blastem_nuklear.o nuklear_ui/sfnt.o
LIBZOBJS=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o\
zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.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 megawifi.o net.o serialize.o $(TERMINAL) $(CONFIGOBJS) gst.o\
- zip.o $(M68KOBJS) $(TRANSOBJS) $(AUDIOOBJS)
+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 megawifi.o net.o serialize.o $(TERMINAL) $(CONFIGOBJS) gst.o \
+ $(M68KOBJS) $(TRANSOBJS) $(AUDIOOBJS) saves.o zip.o
+ifdef NONUKLEAR
+CFLAGS+= -DDISABLE_NUKLEAR
+else
+MAINOBJS+= $(NUKLEAROBJS)
+endif
+
ifdef NOZLIB
CFLAGS+= -DDISABLE_ZLIB
else
@@ -262,4 +272,4 @@ font.tiles : font.png
menu.bin : font_interlace_variable.tiles arrow.tiles cursor.tiles button.tiles font.tiles
clean :
- rm -rf $(ALL) trans ztestrun ztestgen *.o zlib/*.o
+ rm -rf $(ALL) trans ztestrun ztestgen *.o nuklear_ui/*.o zlib/*.o