From f34bb0f36e058fc744546a33ed41c08c4954feca Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Sun, 31 Dec 2017 09:53:33 -0800 Subject: Enable LTO on certain targets that don't need the full LDFLAGS by splitting out the optimization flags into a separate var --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b44fb88..4350168 100644 --- a/Makefile +++ b/Makefile @@ -65,18 +65,18 @@ endif #PORTABLE endif #Windows ifdef DEBUG -CFLAGS:=-ggdb $(CFLAGS) -LDFLAGS:=-ggdb $(LDFLAGS) +OPT:=-ggdb -Og else ifdef NOLTO -CFLAGS:=-O2 $(CFLAGS) -LDFLAGS:=-O2 $(LDFLAGS) +OPT:=-O2 else -CFLAGS:=-O2 -flto $(CFLAGS) -LDFLAGS:=-O2 -flto $(LDFLAGS) +OPT:=-O2 -flto endif #NOLTO endif #DEBUG +CFLAGS:=$(OPT) $(CFLAGS) +LDFLAGS:=$(OPT) $(LDFLAGS) + ifdef Z80_LOG_ADDRESS CFLAGS+= -DZ80_LOG_ADDRESS endif @@ -166,7 +166,7 @@ blastjag$(EXE) : jaguar.o jag_video.o render_sdl.o serialize.o $(M68KOBJS) $(TRA $(CC) -o $@ $^ $(LDFLAGS) dis$(EXE) : dis.o 68kinst.o tern.o vos_program_module.o - $(CC) -o $@ $^ + $(CC) -o $@ $^ $(OPT) jagdis : jagdis.o jagcpu.o tern.o $(CC) -o $@ $^ @@ -178,13 +178,13 @@ libemu68k.a : $(M68KOBJS) $(TRANSOBJS) ar rcs libemu68k.a $(M68KOBJS) $(TRANSOBJS) trans : trans.o serialize.o $(M68KOBJS) $(TRANSOBJS) util.o - $(CC) -o trans trans.o $(M68KOBJS) $(TRANSOBJS) util.o + $(CC) -o trans trans.o $(M68KOBJS) $(TRANSOBJS) util.o $(OPT) transz80 : transz80.o $(Z80OBJS) $(TRANSOBJS) $(CC) -o transz80 transz80.o $(Z80OBJS) $(TRANSOBJS) ztestrun : ztestrun.o serialize.o $(Z80OBJS) $(TRANSOBJS) - $(CC) -o ztestrun ztestrun.o $(Z80OBJS) $(TRANSOBJS) + $(CC) -o ztestrun ztestrun.o $(Z80OBJS) $(TRANSOBJS) $(OPT) ztestgen : ztestgen.o z80inst.o $(CC) -ggdb -o ztestgen ztestgen.o z80inst.o @@ -198,7 +198,7 @@ vgmplay$(EXE) : vgmplay.o render_sdl.o ppm.o serialize.o $(CONFIGOBJS) $(AUDIOOB $(FIXUP) ./$@ blastcpm : blastcpm.o util.o serialize.o $(Z80OBJS) $(TRANSOBJS) - $(CC) -o $@ $^ + $(CC) -o $@ $^ $(OPT) test : test.o vdp.o $(CC) -o test test.o vdp.o -- cgit v1.2.3 From d85bd0c9435bbcab8b63b07652a01e4e5a4a6eaf Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Mon, 15 Jan 2018 09:04:43 -0800 Subject: Initial work on MegaWiFi support --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b44fb88..dc2cde1 100644 --- a/Makefile +++ b/Makefile @@ -127,7 +127,7 @@ Z80OBJS=z80inst.o z80_to_x86.o AUDIOOBJS=ym2612.o psg.o wave.o CONFIGOBJS=config.o tern.o util.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) $(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 serialize.o $(TERMINAL) $(CONFIGOBJS) gst.o $(M68KOBJS) $(TRANSOBJS) $(AUDIOOBJS) ifeq ($(CPU),x86_64) CFLAGS+=-DX86_64 -m64 -- cgit v1.2.3 From ea2646501e91437345afd1cfc85704dd1f983d66 Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Tue, 16 Jan 2018 09:31:00 -0800 Subject: Added support for MegaWiFi command IP_CURRENT --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index dc2cde1..ad2ce4f 100644 --- a/Makefile +++ b/Makefile @@ -127,7 +127,7 @@ Z80OBJS=z80inst.o z80_to_x86.o AUDIOOBJS=ym2612.o psg.o wave.o CONFIGOBJS=config.o tern.o util.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 serialize.o $(TERMINAL) $(CONFIGOBJS) gst.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) ifeq ($(CPU),x86_64) CFLAGS+=-DX86_64 -m64 -- cgit v1.2.3 From 33cb28448b3af298e611cfd4c98edabb1de63e52 Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Fri, 23 Mar 2018 22:23:39 -0700 Subject: Updated fibonacci benchmark code to work with current test harness --- Makefile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 67f1a01..f1fbc2c 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ LIBS=sdl2 glew gl endif #Darwin HAS_PROC:=$(shell if [ -d /proc ]; then /bin/echo -e -DHAS_PROC; fi) -CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -Wno-unused-value $(HAS_PROC) +CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -Wno-unused-value $(HAS_PROC) -DHAVE_UNISTD_H ifeq ($(OS),Darwin) #This should really be based on whether or not the C compiler is clang rather than based on the OS CFLAGS+= -Wno-logical-op-parentheses @@ -126,8 +126,18 @@ endif Z80OBJS=z80inst.o z80_to_x86.o AUDIOOBJS=ym2612.o psg.o wave.o CONFIGOBJS=config.o tern.o util.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 $(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) + +ifdef NOZLIB +CFLAGS+= -DDISABLE_ZLIB +else +MAINOBJS+= $(LIBZOBJS) +endif ifeq ($(CPU),x86_64) CFLAGS+=-DX86_64 -m64 @@ -252,4 +262,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 + rm -rf $(ALL) trans ztestrun ztestgen *.o zlib/*.o -- cgit v1.2.3 From 6e0a7307a3e97579a30655750aea7372115db367 Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Sat, 24 Mar 2018 15:33:44 -0700 Subject: Add support for loading ROMs from zip files --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f1fbc2c..587ba1c 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ LIBZOBJS=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose 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) + zip.o $(M68KOBJS) $(TRANSOBJS) $(AUDIOOBJS) ifdef NOZLIB CFLAGS+= -DDISABLE_ZLIB -- cgit v1.2.3 From db2869d7e0ff15a1050c7b8c4b1a8d41b35fd7c8 Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Sat, 24 Mar 2018 19:40:51 -0700 Subject: Added png screenshot support --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 587ba1c..af0bd04 100644 --- a/Makefile +++ b/Makefile @@ -136,7 +136,7 @@ MAINOBJS=blastem.o system.o genesis.o debug.o gdb_remote.o vdp.o render_sdl.o pp ifdef NOZLIB CFLAGS+= -DDISABLE_ZLIB else -MAINOBJS+= $(LIBZOBJS) +MAINOBJS+= $(LIBZOBJS) png.o endif ifeq ($(CPU),x86_64) -- cgit v1.2.3