SDL build

.gitignore

@@ -12,3 +12,4 @@ src/dep/generated/
 fbneo
 roms
 joyconfig
+fbneo.ini

makefile.sdl

@@ -1,300 +1,104 @@
-# Makefile for FBA, for use with GNU make (Cygwin/MinGW)
+# Makefile for FBNeo, SDL
 #
 # The first pass makes sure all intermediary targets are present. The second pass updates
 # any targets, if necessary. (Intermediary) targets which have their own unique rules
 # are generated as required.
 
+unexport
+
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+DARWIN=1
+endif
+
 #
 #	Flags. Uncomment any of these declarations to enable their function.
 #
 
-# Specify the name of the executable file, without ".exe"
-NAME		= fbneosdl
-EXE		= $(NAME)
-INSTALLDIR	= /usr/local/games/fba/
-ROMDIR		= /usr/local/share/roms/
-BINDIR		= /usr/local/bin/
-FILES		= fbasdl.ini gamelist.txt fb.png
-
 # Check for changes in header files
+ifndef	SKIPDEPEND
 DEPEND = 1
+endif
+
 
 #
 #	Declare variables
 #
 
-ifndef	CPUTYPE
+# Specify the name of the executable file, without ".exe"
-	CPUTYPE	= i686
+NAME = fbneo
-endif
 
-ifdef BUILD_X86_ASM
+undefine BUILD_X86_ASM
-	MMX	= 1
+undefine INCLUDE_AVI_RECORDING
-else
+undefine BUILD_A68K
-	MMX	= 0
+undefine UNICODE
-endif
 
-ifdef	DEBUG
-	NAME := $(NAME)d
-else
-	NAME := $(NAME)
-endif
-
-ifeq	($(CPUTYPE),i686)
-	ppro = ppro
-
-endif
-
-ifneq	($(CPUTYPE),i686)
-	NAME := $(NAME)$(CPUTYPE)
-endif
 
 #
 #	Specify paths/files
 #
 
-objdir	= obj/GNU_SDL/$(NAME)/
+objdir	= obj/
 srcdir	= src/
 
-alldir	= burn \
+include makefile.burn_rules
-		burn/devices \
-		burn/drv \
-		burn/drv/capcom \
-		burn/drv/cave \
-		burn/drv/coleco \
-		burn/drv/cps3 \
-		burn/drv/dataeast \
-		burn/drv/galaxian \
-		burn/drv/irem \
-		burn/drv/konami \
-		burn/drv/megadrive \
-		burn/drv/midway \
-		burn/drv/pce \
-		burn/drv/neogeo \
-		burn/drv/pce \
-		burn/drv/pgm \
-		burn/drv/pre90s \
-		burn/drv/psikyo \
-		burn/drv/pst90s \
-		burn/drv/sega \
-		burn/drv/sg1000 \
-		burn/drv/sms \
-		burn/drv/snes \
-		burn/drv/taito \
-		burn/drv/toaplan \
-		burn/snd \
-		burner \
-		burner/sdl \
-		intf \
-		intf/audio \
-		intf/audio/sdl \
-		intf/cd \
-		intf/cd/sdl \
-		intf/input \
-		intf/input/sdl \
-		intf/video \
-		intf/video/sdl \
-		intf/video/scalers \
-		cpu \
-		cpu/a68k \
-		cpu/arm \
-		cpu/arm7 \
-		cpu/c68k \
-		cpu/cz80 \
-		cpu/h6280 \
-		cpu/hd6309 \
-		cpu/i8039 \
-		cpu/konami \
-		cpu/m68k \
-		cpu/m6502 \
-		cpu/m6800 \
-		cpu/m6805 \
-		cpu/m6809 \
-		cpu/nec \
-		cpu/pic16c5x \
-		cpu/s2650 \
-		cpu/sh2 \
-		cpu/tlcs90 \
-		cpu/z80 \
-		dep/kaillera/client \
-		dep/libs/lib7z \
-		dep/libs/libpng \
-		dep/libs/zlib \
-		dep/mingw/include \
-		dep/scripts \
-		dep/vc/include \
-		dep/generated
 
-incdir	= $(foreach dir,$(alldir),-I$(srcdir)$(dir)) -I$(objdir)dep/generated -I/local/include -I/include/SDL
+# Platform stuff
+alldir	+= 	burner burner/sdl burner/sdl dep/libs/libpng dep/libs/lib7z dep/libs/zlib intf intf/video \
+			intf/video/scalers 	intf/video/sdl intf/audio intf/audio/sdl intf/input intf/input/sdl intf/cd intf/cd/sdl \
+			intf/perfcount intf/perfcount/sdl dep/generated dep/sdl/dynhuff
 
-ifeq ($(OS),Windows_NT)
+depobj	+= 	neocdlist.o \
-lib	= -static -lstdc++ -lpng -lmingw32 -Wl,-Bdynamic -lSDL -lz -lopengl32 -lglu32
-else
-lib	= -lstdc++ -lSDL -lGL -lGLU -lz
-endif
-
-
-drvobj	+= \
-		d_dodonpachi.o d_donpachi.o d_esprade.o d_feversos.o d_gaia.o d_guwange.o d_hotdogst.o d_korokoro.o d_mazinger.o \
-		d_metmqstr.o d_pwrinst2.o d_sailormn.o d_tjumpman.o d_uopoko.o \
 			\
-		d_cps1.o \
+			conc.o cong.o dat.o gamc.o gami.o image.o ioapi.o misc.o sshot.o state.o statec.o unzip.o zipfn.o \
 			\
-		d_cps2.o \
+			adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o gzwrite.o infback.o inffast.o inflate.o inftrees.o \
+			trees.o uncompr.o zutil.o \
 			\
-		d_cps3.o \
+			png.o pngerror.o pngget.o pngmem.o pngpread.o pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o pngtrans.o pngwio.o \
+			pngwrite.o pngwtran.o pngwutil.o \
 			\
-		d_actfancr.o d_backfire.o d_boogwing.o d_cbuster.o d_cninja.o d_darkseal.o d_dassault.o d_dec0.o d_dec8.o \
+			aud_dsp.o aud_interface.o cd_interface.o inp_interface.o interface.o lowpass2.o  vid_interface.o \
-		d_dietgogo.o d_funkyjet.o d_karnov.o d_lemmings.o d_pktgaldx.o d_rohga.o d_sidepckt.o d_simpl156.o d_supbtime.o \
+			vid_softfx.o vid_support.o \
-		d_tumblep.o d_vaportra.o \
-		\
-		d_galaxian.o \
-		\
-		d_m62.o d_m63.o d_m72.o d_m90.o d_m92.o d_m107.o d_vigilant.o \
-		\
-		d_88games.o d_ajax.o d_aliens.o d_asterix.o d_battlnts.o d_bishi.o d_bladestl.o d_blockhl.o d_bottom9.o d_circusc.o d_contra.o \
-		d_crimfght.o d_dbz.o d_finalzr.o d_gberet.o d_gijoe.o d_gbusters.o d_gradius3.o d_gyruss.o d_hcastle.o d_hexion.o d_ironhors.o \
-		d_jailbrek.o d_kontest.o d_labyrunr.o d_lethal.o d_mainevt.o d_megazone.o d_mikie.o d_mogura.o d_moo.o d_mystwarr.o d_nemesis.o \
-		d_pandoras.o d_parodius.o d_pooyan.o d_rocnrope.o d_rockrage.o d_rollerg.o d_scotrsht.o d_shaolins.o d_simpsons.o d_spy.o \
-		d_surpratk.o d_thunderx.o d_timeplt.o d_tmnt.o d_tp84.o d_tutankhm.o d_twin16.o d_ultraman.o d_vendetta.o d_xexex.o d_xmen.o \
-		d_yiear.o \
-		\
-		d_neogeo.o \
-		\
-		d_pgm.o \
-		\
-		d_psikyo.o d_psikyo4.o d_psikyosh.o \
-		\
-		d_angelkds.o d_bankp.o d_dotrikun.o d_hangon.o d_outrun.o d_suprloco.o d_suprnova.o d_sys1.o d_sys16a.o d_sys16b.o d_sys18.o \
-		d_xbrd.o d_ybrd.o d_zaxxon.o \
-		\
-		d_arkanoid.o d_ashnojoe.o d_asuka.o d_bublbobl.o d_chaknpop.o d_darius2.o d_darkmist.o d_exzisus.o d_flstory.o d_lkage.o \
-		d_minivdr.o d_othunder.o d_retofinv.o d_slapshot.o d_superchs.o d_taitob.o d_taitof2.o d_taitomisc.o d_taitox.o d_taitoz.o \
-		d_tnzs.o d_wyvernf0.o \
-		\
-		d_batrider.o d_batsugun.o d_battleg.o d_bbakraid.o d_demonwld.o d_dogyuun.o d_fixeight.o d_ghox.o d_hellfire.o \
-		d_kbash.o d_kbash2.o d_mahoudai.o d_outzone.o d_pipibibs.o d_rallybik.o d_samesame.o d_shippumd.o d_slapfght.o \
-		d_snowbro2.o d_tekipaki.o d_truxton.o d_truxton2.o d_vfive.o d_vimana.o d_zerowing.o \
-		\
-		d_4enraya.o d_1942.o d_1943.o d_alinvade.o d_alpha68k.o d_ambush.o d_arabian.o d_armedf.o d_atetris.o d_aztarac.o d_baraduke.o \
-		d_bionicc.o d_blktiger.o d_blockout.o d_blueprnt.o d_bombjack.o d_capbowl.o d_commando.o d_cybertnk.o d_ddragon.o d_djboy.o d_dkong.o \
-		d_dynduke.o d_epos.o d_exedexes.o d_funkybee.o d_galaga.o d_gauntlet.o d_ginganin.o d_gng.o d_gunsmoke.o d_higemaru.o \
-		d_ikki.o d_invaders.o d_jack.o d_kangaroo.o d_kncljoe.o d_kyugo.o d_ladybug.o d_lwings.o d_lastduel.o d_mario.o d_markham.o \
-		d_marineb.o d_megasys1.o d_meijinsn.o d_mitchell.o d_mole.o d_momoko.o d_mrdo.o d_mrflea.o d_mustache.o d_mystston.o d_ninjakd2.o \
-		d_pacland.o d_pacman.o d_pac2650.o d_pkunwar.o d_prehisle.o d_punchout.o d_psychic5.o d_quizo.o d_rallyx.o d_renegade.o d_rpunch.o \
-		d_route16.o d_scregg.o d_sf.o d_sidearms.o d_skyarmy.o d_skyfox.o d_skykid.o d_snk68.o d_solomon.o d_sonson.o d_srumbler.o d_suna8.o d_tail2nose.o \
-		d_tbowl.o d_tecmo.o d_terracre.o d_tigeroad.o d_timelimt.o d_toki.o d_tsamurai.o d_vulgus.o d_wallc.o d_wc90.o d_wc90b.o d_wwfsstar.o \
-		d_xain.o \
-		\
-		d_1945kiii.o d_aerofgt.o d_airbustr.o d_aquarium.o d_blmbycar.o d_bloodbro.o d_crospang.o d_crshrace.o d_dcon.o d_deniam.o \
-		d_ddragon3.o d_diverboy.o d_dooyong.o d_drgnmst.o d_drtomy.o d_egghunt.o d_esd16.o d_f1gp.o d_funybubl.o \
-		d_fuukifg3.o d_gaelco.o d_gaiden.o d_galpanic.o d_galspnbl.o d_gotcha.o d_gumbo.o d_hyperpac.o d_jchan.o d_kaneko16.o \
-		d_lordgun.o d_mcatadv.o d_midas.o d_mugsmash.o d_mwarr.o d_news.o d_nmg5.o d_nmk16.o d_ohmygod.o d_pass.o d_pirates.o \
-		d_playmark.o d_powerins.o d_pushman.o d_raiden.o d_raiden2.o d_sandscrp.o d_seta.o d_seta2.o d_shadfrce.o d_silkroad.o \
-		d_silvmil.o d_speedspn.o d_suna16.o d_taotaido.o d_tecmo16.o d_tecmosys.o d_tetrisp2.o d_tumbleb.o d_unico.o d_vmetal.o \
-		d_welltris.o d_wwfwfest.o d_xorworld.o d_xxmissio.o d_yunsun16.o d_zerozone.o \
-		\
-		d_parent.o \
-		\
-		d_megadrive.o \
-		\
-		d_pce.o \
-		\
-		d_sms.o \
-		\
-		d_snes.o \
-		\
-		d_coleco.o \
-		\
-		d_sg1000.o
-
-depobj	+= \
-		bzip.o config.o drv.o inpdipsw.o main.o media.o run.o stated.o \
-		stringset.o ips_manager.o support_paths.o scrn.o \
-		\
-		ioapi.o unzip.o conc.o cong.o dat.o gamc.o gami.o image.o \
-		misc.o sshot.o state.o statec.o zipfn.o \
-		\
-		aud_sdl.o inp_sdl.o vid_sdlfx.o vid_sdlopengl.o \
-		\
-		aud_dsp.o aud_interface.o  inp_interface.o interface.o \
-		lowpass2.o vid_interface.o vid_softfx.o vid_support.o \
-		\
-		cd_interface.o cd_isowav.o cdsound.o neocdlist.o \
 			\
 			2xpm.o 2xsai.o ddt3x.o epx.o hq2xs.o hq2xs_16.o xbr.o \
 			\
-		adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o gzwrite.o infback.o \
+			inp_sdl.o aud_sdl.o support_paths.o ips_manager.o scrn.o \
-		inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o \
+			cd_isowav.o cdsound.o config.o main.o run.o stringset.o bzip.o drv.o media.o \
+			inpdipsw.o vid_sdlfx.o dynhuff.o replay.o vid_sdlopengl.o 
+
+ifdef INCLUDE_7Z_SUPPORT
+depobj	+=	un7z.o \
 			\
-		png.o pngerror.o pngget.o pngmem.o pngpread.o pngread.o pngrio.o pngrtran.o pngrutil.o \
+			7zArcIn.o 7zBuf.o 7zBuf2.o 7zCrc.o 7zCrcOpt.o 7zDec.o 7zFile.o 7zStream.o Bcj2.o Bra.o Bra86.o BraIA64.o CpuArch.o \
-		pngset.o pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o \
+			Delta.o LzmaDec.o Lzma2Dec.o Ppmd7.o Ppmd7Dec.o Sha256.o Xz.o XzCrc64.o XzCrc64Opt.o XzDec.o
-		\
+endif
-		$(drvobj) \
-		\
-		burn.o burn_gun.o burn_led.o burn_memory.o burn_sound.o burn_sound_c.o cheat.o debug_track.o hiscore.o load.o \
-		tiles_generic.o timer.o vector.o \
-		\
-		8255ppi.o 8257dma.o eeprom.o nmk004.o kaneko_tmap.o pandora.o seibusnd.o sknsspr.o slapstic.o t5182.o timekpr.o tms34061.o \
-		v3021.o vdc.o tms9928a.o \
-		\
-		ay8910.o burn_y8950.o burn_ym2151.o burn_ym2203.o burn_ym2413.o burn_ym2608.o burn_ym2610.o burn_ym2612.o \
-		burn_ym3526.o burn_ym3812.o burn_ymf278b.o c6280.o dac.o es5506.o es8712.o flt_rc.o fm.o fmopl.o ics2115.o iremga20.o \
-		k005289.o k007232.o k051649.o k053260.o k054539.o msm5205.o msm5232.o msm6295.o namco_snd.o nes_apu.o rf5c68.o saa1099.o \
-		samples.o segapcm.o sn76496.o upd7759.o vlm5030.o x1010.o ym2151.o ym2413.o ymdeltat.o ymf278b.o ymz280b.o \
-		\
-		arm7_intf.o arm_intf.o h6280_intf.o hd6309_intf.o konami_intf.o m6502_intf.o m6800_intf.o m6805_intf.o m6809_intf.o \
-		m68000_intf.o nec_intf.o pic16c5x_intf.o s2650_intf.o tlcs90_intf.o z80_intf.o \
-		\
-		arm.o arm7.o h6280.o hd6309.o i8039.o konami.o m6502.o m6800.o m6805.o m6809.o nec.o pic16c5x.o s2650.o sh2.o tlcs90.o \
-		v25.o z80.o z80daisy.o \
-		\
-		cave.o cave_palette.o cave_sprite.o cave_tile.o \
-		\
-		cps2_crpt.o cps.o cps_config.o cps_draw.o cps_mem.o cps_obj.o cps_pal.o cps_run.o cps_rw.o cps_scr.o cpsr.o cpsrd.o \
-		cpst.o ctv.o fcrash_snd.o kabuki.o ps.o ps_m.o ps_z.o qs.o qs_c.o qs_z.o sf2mdt_snd.o \
-		\
-		cps3run.o cps3snd.o \
-		\
-		deco16ic.o \
-		\
-		gal_gfx.o gal_run.o gal_sound.o gal_stars.o \
-		\
-		irem_cpu.o \
-		\
-		k007342_k007420.o k051316.o k051733.o k051960.o k052109.o k053245.o k053247.o k053250.o k053251.o k053936.o k054000.o \
-		k054338.o k055555.o k056832.o konamigx.o konamiic.o timeplt_snd.o \
-		\
-		neo_decrypt.o neo_palette.o neo_run.o neo_sprite.o neo_text.o neo_upd4990a.o neogeo.o \
-		\
-		pgm_crypt.o pgm_draw.o pgm_run.o pgm_asic3.o pgm_asic27a_type1.o pgm_asic27a_type2.o pgm_asic27a_type3.o pgm_asic25.o \
-		\
-		psikyo_palette.o psikyo_sprite.o psikyo_tile.o psikyosh_render.o \
-		\
-		fd1089.o fd1094.o genesis_vid.o mc8123.o sys16_fd1094.o sys16_gfx.o sys16_run.o \
-		\
-		cchip.o pc080sn.o pc090oj.o taito.o taito_ic.o taito_m68705.o tc0100scn.o tc0110pcr.o tc0140syt.o tc0150rod.o \
-		tc0180vcu.o tc0220ioc.o tc0280grd.o tc0360pri.o tc0480scp.o tc0510nio.o tc0640fio.o tnzs_prot.o \
-		\
-		toa_bcu2.o toa_extratext.o toa_gp9001.o toa_palette.o toaplan1.o toaplan.o \
-		\
-		megadrive.o \
-		\
-		pce.o \
-		\
-		sms.o smspio.o smssystem.o smsvdp.o smsfmintf.o smsrender.o smssound.o smstms.o \
-		\
-		snes_65816.o snes_io.o snes_main.o snes_ppu.o snes_spc700.o snes_dsp.o
 			
 autobj += $(depobj)
 
 ifdef	BUILD_X86_ASM
-autobj += burn_sound_a.o eagle_fm.o 2xsaimmx.o hq2x32.o hq3x32.o hq4x32.o superscale.o
+autobj += eagle_fm.o 2xsaimmx.o hq2x32.o hq3x32.o hq4x32.o superscale.o
+endif
+
+# End, platform stuff
+
+incdir	= $(foreach dir,$(alldir),-I$(srcdir)$(dir)) -I$(objdir)dep/generated \
+		  -I/local/include -I$(srcdir)dep/sdl/include \
+		  -I$(srcdir)intf/input/sdl `sdl-config --cflags`
+
+lib	= -lstdc++ -lSDL `sdl-config --libs` -lGL
+
+ifdef DARWIN
+lib += -L/System/Library/Frameworks/OpenGL.framework/Libraries/ 
 endif
 
 autdep	= $(depobj:.o=.d)
+drvdep	= $(drvsrc:.o=.d)
+
+ifdef	BUILD_A68K
+a68k.o	= $(objdir)cpu/a68k/a68k.o
+endif
 
-#app_windres.rc = $(srcdir)dep/generated/app_windres.rc
-#license.rc = $(srcdir)dep/generated/license.rc
 driverlist.h = $(srcdir)dep/generated/driverlist.h
 ctv.h	= $(srcdir)dep/generated/ctv.h
 toa_gp9001_func.h = $(srcdir)dep/generated/toa_gp9001_func.h
@@ -319,6 +123,10 @@ allobj	= $(objdir)cpu/m68k/m68kcpu.o $(objdir)cpu/m68k/m68kops.o \
 		$(foreach dir,$(alldir),$(subst $(srcdir),$(objdir), \
 		$(firstword $(subst .rc,.o,$(wildcard $(srcdir)$(dir)/$(file)))))))
 		
+ifdef BUILD_A68K
+allobj += $(a68k.o)
+endif
+
 alldep	= $(foreach file,$(autobj:.o=.c), \
 		$(foreach dir,$(alldir),$(subst $(srcdir),$(objdir), \
 		$(firstword $(subst .c,.d,$(wildcard $(srcdir)$(dir)/$(file))))))) \
@@ -329,64 +137,116 @@ alldep	= $(foreach file,$(autobj:.o=.c), \
 		$(foreach dir,$(alldir),$(subst $(srcdir),$(objdir), \
 		$(firstword $(subst .rc,.d,$(wildcard $(srcdir)$(dir)/$(file)))))))
 		
+autdrv := $(drvsrc:.cpp=.o)
+
 #
 #
 #	Specify compiler/linker/assembler
 #
 #
 
-HOSTCC	= gcc
+CC	= gcc-9
-HOSTCXX	= g++
+CXX	= gcc-9 #g++
-CC	= gcc
-CXX	= g++
 LD	= $(CXX)
 AS	= nasm
 
-HOSTCFLAGS = $(incdir)
+#LDFLAGS	= -static
-CFLAGS = -O2 -fomit-frame-pointer -Wno-write-strings -DLSB_FIRST -DFASTCALL -DBUILD_M68K -DINCLUDE_LIB_PNGH
-CXXFLAGS = -O2 -fomit-frame-pointer -Wno-write-strings -DLSB_FIRST -DFASTCALL -DBUILD_M68K -DINCLUDE_LIB_PNGH
-DEF := -DCPUTYPE=$(CPUTYPE) -DUSE_SPEEDHACKS -DBUILD_SDL
 
-CFLAGS += -U__cdecl -U__fastcall -D__cdecl="" -D__fastcall=""
+CFLAGS = -O2 -fomit-frame-pointer -Wno-write-strings \
-CXXFLAGS += -U__cdecl -U__fastcall -D__cdecl="" -D__fastcall=""
+	   -Wall -Wno-long-long -Wno-sign-compare -Wno-uninitialized -Wno-unused \
+	   -Wno-pedantic -Wno-conversion -Wno-attributes \
+	   -Wno-unused-parameter -Wno-unused-value \
+	   $(PLATFLAGS) $(DEF) $(incdir)
+
+CXXFLAGS = -O2 -fomit-frame-pointer -Wno-write-strings \
+	   -Wall -W -pedantic -Wno-long-long \
+	   -Wunknown-pragmas -Wundef -Wconversion -Wno-missing-braces \
+	   -Wuninitialized -Wpointer-arith -Winline -Wno-multichar \
+	   -Wno-pedantic -Wno-conversion -Wno-attributes \
+	   -Wno-unused-parameter -Wno-unused-value -Wno-narrowing \
+	   $(PLATFLAGS) $(DEF) $(incdir)
+
+ASFLAGS	=  -O1 -f coff -w-orphan-labels
+
+#       D3DUtils & D3DMath need these
+#       DEF     = -Dsinf=\(float\)sin -Dcosf=\(float\)cos -Dasinf=\(float\)asin -Dacosf=\(float\)acos -Dsqrtf=\(float\)sqrt
+
+# FIXME
+	DEF	:= -DBUILD_SDL -DUSE_SPEEDHACKS -DFILENAME=$(NAME) -DUSE_FILE32API
+
+ifdef UNICODE
+	DEF	:= $(DEF) -D_UNICODE
+endif
 
 ifdef SPECIALBUILD
 	DEF	:= $(DEF) -DSPECIALBUILD=$(SPECIALBUILD)
 endif
 
+ifdef FASTCALL
+	DEF	:= $(DEF) -DFASTCALL
+endif
+
 ifdef DEBUG
-	DEF	:= $(DEF) -D_DEBUG
+	DEF	:= $(DEF) -DFBNEO_DEBUG
-	CFLAGS += -g
+endif
-	CXXFLAGS += -g
+
+ifdef ROM_VERIFY
+	DEF	:= $(DEF) -DROM_VERIFY
+endif
+
+ifdef INCLUDE_7Z_SUPPORT
+	DEF := $(DEF) -DINCLUDE_7Z_SUPPORT
+endif
+
+ifdef INCLUDE_AVI_RECORDING
+	DEF := $(DEF) -DINCLUDE_AVI_RECORDING
+endif
+
+ifdef LSB_FIRST
+	DEF	:= $(DEF) -DLSB_FIRST
+endif
+
+ifdef INCLUDE_LIB_PNGH
+	DEF	:= $(DEF) -DINCLUDE_LIB_PNGH
+endif
+
+ifdef BUILD_A68K
+	DEF	:= $(DEF) -DBUILD_A68K
 endif
 
 ifdef BUILD_X86_ASM
 	DEF := $(DEF) -DBUILD_X86_ASM
 endif
 
-ifdef	MMX
+ifdef BUILD_X64_EXE
-	DEF	+= -DMMX
+	DEF := $(DEF) -DBUILD_X64_EXE -DXBYAK_NO_OP_NAMES -DMIPS3_X64_DRC
 endif
 
-DEF    := $(DEF) -DFILENAME=$(NAME)
+ifdef	SYMBOL
 
-ifdef BUILD_X86_ASM
+	CFLAGS   += -ggdb3
-	CFLAGS	 += -mmmx
+	CXXFLAGS += -ggdb3
-	CXXFLAGS += -mmmx
+	ASFLAGS  += -g
+	DEF	 := $(DEF) -D_DEBUG
+
+ifdef PROFILE
+	CFLAGS	 += -pg
+	CXXFLAGS += -pg
+else
+	CFLAGS	 += -fomit-frame-pointer
+	CXXFLAGS += -fomit-frame-pointer
 endif
 
-CFLAGS += $(DEF) $(incdir)
+else
-CXXFLAGS += $(DEF) $(incdir)
-ifndef DEBUG
 	LDFLAGS	 += -s
 endif
-ASFLAGS = -O1
 
-ifeq ($(OS),Windows_NT)
+# For zlib
-CFLAGS_CONSOLE = -mno-cygwin -mconsole -pipe -Wall -W $(DEF) $(incdir)
+DEF := $(DEF) -DNO_VIZ -D_LARGEFILE64_SOURCE=0 -D_FILE_OFFSET_BITS=32
-ASFLAGS += -f coff
+
-else
+# For lib7z
-ASFLAGS += -f elf
+ifdef INCLUDE_7Z_SUPPORT
+DEF := $(DEF) -D_7ZIP_PPMD_SUPPPORT
 endif
 
 #
@@ -415,12 +275,14 @@ vpath %.d 	$(foreach dir,$(alldir),$(objdir)$(dir)/ )
 ifeq ($(MAKELEVEL),1)
 ifdef DEPEND
 
-all:	init $(autdep) $(autobj)
+all:	init $(drvdep) $(autdep) $(autobj) $(autdrv)
-	@$(MAKE) -f makefile.sdl
+	@$(MAKE) -f makefile.sdl -s
+
 else
 
-all:	init $(autobj)
+all:	init $(autobj) $(autdrv)
-	@$(MAKE) -f makefile.sdl
+	@$(MAKE) -f makefile.sdl -s
+
 endif
 else
 
@@ -436,9 +298,13 @@ endif
 
 ifeq ($(MAKELEVEL),2)
 
-$(NAME):	$(allobj)
+$(objdir)drivers.o:		$(autdrv)
+	@echo Linking drivers...
+	@$(LD) -r -nostdlib -o $@ $^
+
+$(NAME):	$(allobj) $(objdir)drivers.o
 	@echo
-	@echo Linking executable $(NAME)...
+	@echo Linking executable... $(NAME)
 	@$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(lib)
 
 ifdef	DEBUG
@@ -452,16 +318,22 @@ endif
 endif
 endif
 
+ifeq ($(MAKELEVEL),1)
+ifdef FORCE_UPDATE
+$(build_details.h): FORCE
+endif
+endif
+
 #
 #	Generate the gamelist
 #
 
 burn.o burn.d:	driverlist.h
 
-$(driverlist.h): $(drvobj) $(srcdir)dep/scripts/gamelist.pl
+$(driverlist.h): $(drvsrc) $(srcdir)dep/scripts/gamelist.pl
 ifdef	PERL
-	@perl $(srcdir)dep/scripts/gamelist.pl -o $@ -l gamelist.txt \
+	@$(srcdir)dep/scripts/gamelist.pl -o $@ -l gamelist.txt \
-		$(filter %.cpp,$(foreach file,$(drvobj:.o=.cpp),$(foreach dir,$(alldir), \
+		$(filter %.cpp,$(foreach file,$(drvsrc:.o=.cpp),$(foreach dir,$(alldir), \
 		$(firstword $(wildcard $(srcdir)$(dir)/$(file))))))
 else
 ifeq ($(MAKELEVEL),2)
@@ -473,42 +345,35 @@ endif
 endif
 
 #
-#	Fix the .rc file
+# Verify if driverlist.h needs to be updated
 #
 
-resource.o resource.d:	$(app_windres.rc) version.rc version.h
+#ifeq ($(MAKELEVEL),1)
+#ifdef FORCE_UPDATE
+#$(driverlist.h): FORCE
+#endif
+#endif
 
-$(license.rc): $(srcdir)license.txt $(srcdir)dep/scripts/license2rtf.pl $(srcdir)dep/scripts/license2rc.pl
-
-ifdef	PERL
-	@perl $(srcdir)dep/scripts/license2rtf.pl $< -o $(srcdir)dep/generated/$(@F:.rc=.rtf)
-	@perl $(srcdir)dep/scripts/license2rc.pl $(srcdir)dep/generated/$(@F:.rc=.rtf) -o $@
-else
-ifeq ($(MAKELEVEL),2)
-	@echo
-	@echo Warning: Perl is not available on this system.
-	@echo $@ cannot be updated or created!
-	@echo
-endif
-endif
-
-$(app_windres.rc): app.rc $(license.rc) $(srcdir)dep/scripts/fixrc.pl $(srcdir)burner/resource/fba.ico $(srcdir)burner/resource/about.bmp $(srcdir)burner/resource/preview.bmp $(srcdir)burner/resource/misc.bmp
-
-ifdef	PERL
-	@perl $(srcdir)dep/scripts/fixrc.pl $< -o $@
-else
-ifeq ($(MAKELEVEL),2)
-	@echo
-	@echo Warning: Perl is not available on this system.
-	@echo $@ cannot be updated or created!
-	@echo
-endif
-endif
 
 #
-#	Compile Musashi 68000 cores
+#	Compile 68000 cores
 #
 
+# A68K
+
+ifdef	BUILD_A68K
+$(a68k.o):	fba_make68k.c
+	@echo Compiling A68K MC68000 core...
+	@$(CC) -mconsole $(CFLAGS) $(LDFLAGS) -DWIN32 -Wno-unused -Wno-conversion -Wno-missing-prototypes \
+		-s $< -o $(subst $(srcdir),$(objdir),$(<D))/$(<F:.c=.exe)
+	@$(subst $(srcdir),$(objdir),$(<D))/$(<F:.c=.exe) $(@:.o=.asm) \
+		$(@D)/a68k_tab.asm 00 $(ppro)
+	@echo Assembling A68K MC68000 core...
+	@$(AS) $(ASFLAGS) $(@:.o=.asm) -o $@
+endif
+
+# Musashi
+
 $(objdir)cpu/m68k/m68kcpu.o: $(srcdir)cpu/m68k/m68kcpu.c $(objdir)dep/generated/m68kops.h $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
 	@echo Compiling Musashi MC680x0 core \(m68kcpu.c\)...
 	@$(CC) $(CFLAGS) -c $(srcdir)cpu/m68k/m68kcpu.c -o $(objdir)cpu/m68k/m68kcpu.o
@@ -517,23 +382,25 @@ $(objdir)cpu/m68k/m68kops.o: $(objdir)cpu/m68k/m68kmake $(objdir)dep/generated/m
 	@echo Compiling Musashi MC680x0 core \(m68kops.c\)...
 	@$(CC) $(CFLAGS) -c $(objdir)dep/generated/m68kops.c -o $(objdir)cpu/m68k/m68kops.o
 
-$(objdir)dep/generated/m68kops.h: $(objdir)cpu/m68k/m68kmake $(srcdir)cpu/m68k/m68k_in.c
+$(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kops.c: $(objdir)cpu/m68k/m68kmake $(srcdir)cpu/m68k/m68k_in.c
-	$(objdir)/cpu/m68k/m68kmake $(objdir)dep/generated/ $(srcdir)cpu/m68k/m68k_in.c
+	$(objdir)cpu/m68k/m68kmake $(objdir)dep/generated/ $(srcdir)cpu/m68k/m68k_in.c
 
 $(objdir)cpu/m68k/m68kmake: $(srcdir)cpu/m68k/m68kmake.c
 	@echo Compiling Musashi MC680x0 core \(m68kmake.c\)...
-	@$(HOSTCC) $(HOSTCFLAGS) $(srcdir)cpu/m68k/m68kmake.c -o $(objdir)cpu/m68k/m68kmake
+	@$(CC) $(CFLAGS) $(srcdir)cpu/m68k/m68kmake.c -o $(objdir)cpu/m68k/m68kmake
+
 
 #
-#	Extra rules for generated header file cvt.h, needed by ctv.cpp
+#	Extra rules for generated header file ctv.h, needed by ctv.cpp
 #
 
 ctv.d ctv.o:	$(ctv.h)
 
 $(ctv.h):	ctv_make.cpp
 	@echo Generating $(srcdir)dep/generated/$(@F)...
-	@$(HOSTCXX) $(LDFLAGS) $< -o $(objdir)dep/generated/ctv_make
+	@$(CC) $(CXXFLAGS) $(LDFLAGS) $< \
-	@$(objdir)dep/generated/ctv_make >$@
+		-o $(subst $(srcdir),$(objdir),$(<D))/$(<F:.cpp=.exe)
+	@$(subst $(srcdir),$(objdir),$(<D))/$(<F:.cpp=.exe) >$@
 
 #
 #	Extra rules for generated header file toa_gp9001_func.h, needed by toa_gp9001.cpp
@@ -560,7 +427,7 @@ $(neo_sprite_func.h):	$(srcdir)dep/scripts/neo_sprite_func.pl
 cave_tile.d cave_tile.o: $(cave_tile_func.h)
 
 $(cave_tile_func.h):	$(srcdir)dep/scripts/cave_tile_func.pl
-	@perl $(srcdir)dep/scripts/cave_tile_func.pl -o $(cave_tile_func.h)
+	@$(srcdir)dep/scripts/cave_tile_func.pl -o $(cave_tile_func.h)
 
 #
 #	Extra rules for generated header file cave_sprite_func.h, needed by cave_sprite.cpp
@@ -569,7 +436,7 @@ $(cave_tile_func.h):	$(srcdir)dep/scripts/cave_tile_func.pl
 cave_sprite.d cave_sprite.o: $(cave_sprite_func.h)
 
 $(cave_sprite_func.h):	$(srcdir)dep/scripts/cave_sprite_func.pl
-	@perl $(srcdir)dep/scripts/cave_sprite_func.pl -o $(cave_sprite_func.h)
+	@$(srcdir)dep/scripts/cave_sprite_func.pl -o $(cave_sprite_func.h)
 
 #
 #	Extra rules for generated header file psikyo_tile_func.h / psikyo_sprite_func.h, needed by psikyo_tile.cpp / psikyo_sprite.cpp
@@ -578,7 +445,7 @@ $(cave_sprite_func.h):	$(srcdir)dep/scripts/cave_sprite_func.pl
 psikyo_tile.d psikyo_tile.o psikyosprite.d psikyo_sprite.o: $(psikyo_tile_func.h)
 
 $(psikyo_tile_func.h):	$(srcdir)dep/scripts/psikyo_tile_func.pl
-	@perl $(srcdir)dep/scripts/psikyo_tile_func.pl -o $(psikyo_tile_func.h)
+	$(srcdir)dep/scripts/psikyo_tile_func.pl -o $(psikyo_tile_func.h)
 
 #
 #	Extra rules for generated header file pgm_sprite.h, needed by pgm_draw.cpp
@@ -588,8 +455,10 @@ pgm_draw.d pgm_draw.o:	$(pgm_sprite.h)
 
 $(pgm_sprite.h):	pgm_sprite_create.cpp
 	@echo Generating $(srcdir)dep/generated/$(@F)...
-	@$(HOSTCXX) $(LDFLAGS) $< -o $(objdir)dep/generated/pgm_sprite_create
+	@$(CC) $(CXXFLAGS) $(LDFLAGS) $< \
-	@$(objdir)dep/generated/pgm_sprite_create >$@
+		-o $(subst $(srcdir),$(objdir),$(<D))/$(<F:.cpp=.exe)
+	@$(subst $(srcdir),$(objdir),$(<D))/$(<F:.cpp=.exe) >$@
+
 	
 ifeq ($(MAKELEVEL),2)
 ifdef DEPEND
@@ -599,34 +468,25 @@ include	$(alldep)
 endif
 endif
 
-#
-#	Generic rule for resource files
-#
-
-%.o:	%.rc
-	@echo Compiling resource file $(<F)...
-	@windres $(DEF) $< -o $(subst $(srcdir),$(objdir),$(<D))/$(@F) $(foreach dir,$(alldir),--include-dir $(srcdir)$(dir))
 
 #
 #	Generic rules for C/C++ files
 #
+# Note: require init to complete before assembling anything (see "| init" below)
+# to avoid parallization issues on fresh builds.
+#
 
 ifeq ($(MAKELEVEL),1)
 
-ifdef FORCE_UPDATE
-resource.o: FORCE
-about.o: FORCE
-endif
-
 %.o:	%.cpp
 	@echo Compiling $<...
-	@$(CXX) $(CXXFLAGS) -c $< -o $(subst $(srcdir),$(objdir),$(<D))/$(@F)
+	@$(CC) $(CXXFLAGS) -c $< -o $(subst $(srcdir),$(objdir),$(<D))/$(@F)
 
 %.o:	%.c
 	@echo Compiling $<...
-	@$(CC) $(CFLAGS) -Wno-unused -Wno-conversion -Wno-missing-prototypes -c $< -o $(subst $(srcdir),$(objdir),$(<D))/$(@F)
+	@$(CC) $(CFLAGS) -c $< -o $(subst $(srcdir),$(objdir),$(<D))/$(@F)
 
-%.o:	%.asm
+%.o:	%.asm | init
 	@echo Assembling $<...
 	@$(AS) $(ASFLAGS) $< -o $(subst $(srcdir),$(objdir),$(<D))/$(@F)
 
@@ -634,9 +494,9 @@ else
 
 %.o:	%.c
 	@echo Compiling $<...
-	@$(CC) $(CFLAGS) -Wno-unused -Wno-conversion -Wno-missing-prototypes -c $< -o $@
+	@$(CC) $(CFLAGS) -c $< -o $@
 
-%.o:	%.asm
+%.o:	%.asm | init
 	@echo Assembling $<...
 	@$(AS) $(ASFLAGS) $< -o $@
 
@@ -654,15 +514,15 @@ ifdef DEPEND
 
 %.d:	%.c
 	@echo Generating depend file for $<...
-	@$(CC) -MM -MT "$(subst $(srcdir),$(objdir),$(<D))/$(*F).o $(subst $(srcdir),$(objdir),$(<D))/$(@F)" -x c++ $(CFLAGS) $< >$(subst $(srcdir),$(objdir),$(<D))/$(@F)
+	@$(CC) -MM -MT "$(subst $(srcdir),$(objdir),$(<D))/$(*F).o $(subst $(srcdir),$(objdir),$(<D))/$(@F)" -x c++ $(CXXFLAGS) $< >$(subst $(srcdir),$(objdir),$(<D))/$(@F)
 
 %.d:	%.cpp
 	@echo Generating depend file for $<...
-	@$(CXX) -MM -MT "$(subst $(srcdir),$(objdir),$(<D))/$(*F).o $(subst $(srcdir),$(objdir),$(<D))/$(@F)" -x c++ $(CXXFLAGS) $< >$(subst $(srcdir),$(objdir),$(<D))/$(@F)
+	@$(CC) -MM -MT "$(subst $(srcdir),$(objdir),$(<D))/$(*F).o $(subst $(srcdir),$(objdir),$(<D))/$(@F)" -x c++ $(CXXFLAGS) $< >$(subst $(srcdir),$(objdir),$(<D))/$(@F)
 
 %.d:	%.rc
 	@echo Generating depend file for $<...
-	@$(CC) -MM -MT "$(subst $(srcdir),$(objdir),$(<D))/$(*F).o $(subst $(srcdir),$(objdir),$(<D))/$(@F)" -x c++ $(CFLAGS) $< >$(subst $(srcdir),$(objdir),$(<D))/$(@F)
+	@$(CC) -MM -MT "$(subst $(srcdir),$(objdir),$(<D))/$(*F).o $(subst $(srcdir),$(objdir),$(<D))/$(@F)" -x c++ $(CXXFLAGS) $< >$(subst $(srcdir),$(objdir),$(<D))/$(@F)
 
 endif
 
@@ -683,31 +543,24 @@ endif
 
 cleandep:
 	@echo Removing depend files from $(objdir)...
-	@for dir in $(alldir); do rm -f $(objdir)$$dir/*.d; done
+	-@for dir in $(alldir); do rm -f $(objdir)$$dir/*.d; done
 
 touch:
 	@echo Marking all targets for $(NAME) as uptodate...
-	@for dir in $(alldir); do touch -c $(objdir)$$dir/*; done
+	-@touch $(NAME).exe
-	@do touch -c $(srcdir)/generated/*
+	-@touch -c -r $(NAME).exe $(srcdir)/dep/generated/*
-	@touch $(NAME).exe
+	-@for dir in $(alldir); do touch -c  -r $(NAME).exe $(objdir)$$dir/*; done
-install:
-	mkdir -p $(INSTALLDIR)
-	mkdir -p $(ROMDIR)
-	cp $(EXE) $(INSTALLDIR)
-	cp $(FILES) $(INSTALLDIR)
-	ln -fs $(INSTALLDIR)$(EXE) $(BINDIR)$(EXE)
 
 clean:
 	@echo Removing all files from $(objdir)...
-	@rm -f -r $(objdir)
+	-@rm -f -r $(objdir)
-	@rm -f -r $(ctv.h)
+	-@rm -f -r $(ctv.h)
 
 ifdef	PERL
 	@echo Removing all files generated with perl scripts...
-	@rm -f -r $(app_windres.rc) $(driverlist)
+	-@rm -f -r $(app_gnuc.rc) $(driverlist)
 endif
-	@echo Removing executable file...
+
-	@rm -f $(EXE)
 
 #
 #	Rule to force recompilation of any target that depends on it

makefile.sdlrules

@@ -1,138 +0,0 @@
-alldir	= 	burn burn/devices burn/sound burn/drivers burn/drivers/capcom burn/drivers/cave burn/drivers/cps3 \
-			burn/drivers/dataeast burn/drivers/galaxian burn/drivers/irem burn/drivers/konami burn/drivers/megadrive \
-			burn/drivers/misc_post90s burn/drivers/misc_pre90s burn/drivers/neogeo burn/drivers/pgm burn/drivers/psikyo \
-			burn/drivers/sega burn/drivers/snes burn/drivers/taito burn/drivers/toaplan burner burner/platform/sdl cpu cpu/a68k \
-			cpu/arm cpu/arm7 cpu/h6280 cpu/hd6309 cpu/i8039 cpu/konami cpu/m68k cpu/m6502 cpu/m6800 cpu/m6805 cpu/m6809 cpu/nec \
-			cpu/s2650 cpu/sh2 cpu/z80 depend/kaillera/client depend/libs/libpng depend/libs/zlib interface interface/video \
-			interface/video/scalers interface/video/sdl interface/audio interface/audio/sdl interface/input \
-			interface/input/sdl interface/cd interface/cd/sdl interface/perfcount  \
-			depend/generated
-
-drvobj	= 	d_dodonpachi.o d_donpachi.o d_esprade.o d_feversos.o d_gaia.o d_guwange.o d_hotdogst.o d_korokoro.o d_mazinger.o \
-			d_metmqstr.o d_pwrinst2.o d_sailormn.o d_tjumpman.o d_uopoko.o \
-			\
-			d_cps1.o \
-			\
-			d_cps2.o \
-			\
-			d_cps3.o \
-			\
-			d_actfancr.o d_backfire.o d_boogwing.o d_cbuster.o d_cninja.o d_darkseal.o d_dassault.o d_dec0.o d_dec8.o \
-			d_dietgogo.o d_funkyjet.o d_karnov.o d_lemmings.o d_rohga.o d_sidepckt.o d_simpl156.o d_supbtime.o d_tumblep.o \
-			d_vaportra.o \
-			\
-			d_galaxian.o \
-			\
-			d_m62.o d_m63.o d_m72.o d_m90.o d_m92.o d_vigilant.o \
-			\
-			d_88games.o d_ajax.o d_aliens.o d_blockhl.o d_bottom9.o d_contra.o d_crimfght.o d_gberet.o d_gbusters.o d_gradius3.o \
-			d_gyruss.o d_hcastle.o d_hexion.o d_kontest.o d_mainevt.o d_mogura.o d_parodius.o d_pooyan.o d_rollerg.o d_scotrsht.o \
-			d_simpsons.o d_spy.o d_surpratk.o d_thunderx.o d_tmnt.o d_twin16.o d_ultraman.o d_vendetta.o d_xmen.o \
-			\
-			d_neogeo.o \
-			\
-			d_pgm.o \
-			\
-			d_psikyo.o d_psikyo4.o d_psikyosh.o \
-			\
-			d_angelkds.o d_bankp.o d_dotrikun.o d_hangon.o d_outrun.o d_suprloco.o d_sys1.o d_sys16a.o d_sys16b.o d_sys18.o \
-			d_xbrd.o d_ybrd.o \
-			\
-			d_arkanoid.o d_ashnojoe.o d_asuka.o d_bublbobl.o d_chaknpop.o d_darius2.o d_flstory.o d_lkage.o d_minivdr.o \
-			d_othunder.o d_retofinv.o d_slapshot.o d_superchs.o d_taitob.o d_taitof2.o d_taitomisc.o d_taitox.o d_taitoz.o \
-			d_tnzs.o \
-			\
-			d_batrider.o d_batsugun.o d_battleg.o d_bbakraid.o d_demonwld.o d_dogyuun.o d_fixeight.o d_ghox.o d_hellfire.o \
-			d_kbash.o d_kbash2.o d_mahoudai.o d_outzone.o d_pipibibs.o d_rallybik.o d_samesame.o d_shippumd.o d_snowbro2.o \
-			d_tekipaki.o d_tigerheli.o d_truxton.o d_truxton2.o d_vfive.o d_vimana.o d_zerowing.o \
-			\
-			d_4enraya.o d_1942.o d_1943.o d_ambush.o d_arabian.o d_armedf.o d_atetris.o d_aztarac.o d_baraduke.o d_bionicc.o \
-			d_blktiger.o d_blockout.o d_blueprnt.o d_bombjack.o d_commando.o d_cybertnk.o d_ddragon.o d_dkong.o d_dynduke.o d_epos.o \
-			d_exedexes.o d_funkybee.o d_galaga.o d_gauntlet.o d_ginganin.o d_gng.o d_gunsmoke.o d_higemaru.o d_ikki.o d_jack.o \
-			d_kangaroo.o d_kyugo.o d_ladybug.o d_lwings.o d_madgear.o d_markham.o d_marineb.o d_meijinsn.o d_mitchell.o d_mole.o \
-			d_momoko.o d_mrdo.o d_mrflea.o d_mystston.o d_pacland.o d_pacman.o d_pac2650.o d_pkunwar.o d_prehisle.o d_quizo.o \
-			d_rallyx.o d_renegade.o d_rpunch.o d_route16.o d_scregg.o d_sf.o d_skyfox.o d_skykid.o d_snk68.o d_solomon.o \
-			d_sonson.o d_srumbler.o d_tecmo.o d_terracre.o d_tigeroad.o d_toki.o d_vulgus.o d_wallc.o d_wc90.o d_wc90b.o \
-			d_wwfsstar.o \
-			\
-			d_1945kiii.o d_aerofgt.o d_airbustr.o d_aquarium.o d_blmbycar.o d_bloodbro.o d_crospang.o d_crshrace.o d_dcon.o \
-			d_deniam.o d_ddragon3.o d_diverboy.o d_drtomy.o d_egghunt.o d_esd16.o d_f1gp.o d_fstarfrc.o d_funybubl.o d_fuukifg3.o \
-			d_gaelco.o d_gaiden.o d_galpanic.o d_galspnbl.o d_gotcha.o d_gumbo.o d_hyperpac.o d_jchan.o d_kaneko16.o d_lordgun.o \
-			d_mcatadv.o d_midas.o d_mugsmash.o d_news.o d_nmg5.o d_nmk16.o d_ohmygod.o d_pass.o d_pirates.o d_pktgaldx.o \
-			d_powerins.o d_pushman.o d_raiden.o d_seta.o d_seta2.o d_shadfrce.o d_silkroad.o d_silvmin.o d_speedspn.o d_suna16.o \
-			d_taotaido.o d_tecmosys.o d_tumbleb.o d_unico.o d_vmetal.o d_welltris.o d_wwfwfest.o d_xorworld.o d_yunsun16.o \
-			d_zerozone.o \
-			\
-			d_parent.o \
-			\
-			d_megadrive.o \
-			\
-			d_snes.o
-
-depobj	:= 	main.o drv.o load.o misc.o \
-		    vid_sdlfx.o vid_softfx.o vid_interface.o vid_support.o config.o \
-		    state.o stated.o statec.o run.o inpdipsw.o gami.o gamc.o \
-		    cheat.o vid_sdlopengl.o \
-		    inp_interface.o inp_sdl.o\
-		    bzip.o unzip.o zipfn.o cong.o conc.o\
-		    interface.o sshot.o dat.o aud_sdl.o aud_interface.o aud_dsp.o \
-		    lowpass2.o \
-			\
-			$(drvobj) \
-			\
-			burn.o burn_gun.o burn_led.o burn_memory.o burn_sound.o burn_sound_c.o cheat.o debug_track.o hiscore.o load.o \
-			tiles_generic.o timer.o vector.o \
-			\
-			8255ppi.o eeprom.o pandora.o seibusnd.o slapstic.o timekpr.o v3021.o \
-			\
-			ay8910.o burn_y8950.o burn_ym2151.o burn_ym2203.o burn_ym2413.o burn_ym2608.o burn_ym2610.o burn_ym2612.o \
-			burn_ym3526.o burn_ym3812.o burn_ymf278b.o dac.o es5506.o es8712.o fm.o fmopl.o ics2115.o iremga20.o k007232.o \
-			k051649.o k053260.o k054539.o msm5205.o msm6295.o namco_snd.o rf5c68.o saa1099.o samples.o segapcm.o sn76496.o \
-			upd7759.o x1010.o ym2151.o ym2413.o ymdeltat.o ymf278b.o ymz280b.o \
-			\
-			arm7_intf.o arm_intf.o h6280_intf.o hd6309_intf.o konami_intf.o m6502_intf.o m6800_intf.o m6805_intf.o m6809_intf.o \
-			m68000_intf.o nec_intf.o s2650_intf.o z80_intf.o \
-			\
-			arm.o arm7.o h6280.o hd6309.o i8039.o konami.o m6502.o m6800.o m6805.o m6809.o nec.o s2650.o sh2.o v25.o z80.o \
-			z80daisy.o \
-			\
-			2xpm.o 2xsai.o epx.o hq2xs.o hq2xs_16.o \
-			\
-			cave.o cave_palette.o cave_sprite.o cave_tile.o \
-			\
-			cps2_crpt.o cps.o cps_config.o cps_draw.o cps_mem.o cps_obj.o cps_pal.o cps_run.o cps_rw.o cps_scr.o cpsr.o cpsrd.o \
-			cpst.o ctv.o kabuki.o ps.o ps_m.o ps_z.o qs.o qs_c.o qs_z.o \
-			\
-			cps3run.o cps3snd.o \
-			\
-			deco16ic.o \
-			\
-			gal_gfx.o gal_run.o gal_sound.o gal_stars.o \
-			\
-			irem_cpu.o \
-			\
-			k051316.o k051733.o k051960.o k052109.o k053245.o k053247.o k053251.o k053936.o k054000.o konamiic.o \
-			\
-			neo_decrypt.o neo_palette.o neo_run.o neo_sprite.o neo_text.o neo_upd4990a.o neogeo.o \
-			\
-			pgm_crypt.o pgm_draw.o pgm_prot.o pgm_run.o \
-			\
-			psikyo_palette.o psikyo_sprite.o psikyo_tile.o psikyosh_render.o \
-			\
-			fd1089.o fd1094.o genesis_vid.o mc8123.o sys16_fd1094.o sys16_gfx.o sys16_run.o \
-			\
-			cchip.o pc080sn.o pc090oj.o taito.o taito_ic.o taito_m68705.o tc0100scn.o tc0110pcr.o tc0140syt.o tc0150rod.o \
-			tc0180vcu.o tc0220ioc.o tc0280grd.o tc0360pri.o tc0480scp.o tc0510nio.o tc0640fio.o tnzs_prot.o \
-			\
-			toa_bcu2.o toa_extratext.o toa_gp9001.o toa_palette.o toaplan1.o toaplan.o \
-			\
-			nmk004.o \
-			\
-			megadrive.o \
-			\
-			snes_65816.o snes_io.o snes_main.o snes_mem.o snes_ppu.o snes_spc700.o snes_dsp.o
-			
-			
-
-autobj += $(depobj)
-

src/burn/burn.cpp

@@ -196,7 +196,7 @@ extern "C" TCHAR* BurnDrvGetText(UINT32 i)
 
 	if (!(i & DRV_ASCIIONLY)) {
 		switch (i & 0xFF) {
-#if !defined(__LIBRETRO__) && !defined(BUILD_PI)
+#if !defined(__LIBRETRO__) && !defined(BUILD_SDL)
 			case DRV_FULLNAME:
 				pszStringW = pDriver[nBurnDrvActive]->szFullNameW;
 				
@@ -236,7 +236,7 @@ extern "C" TCHAR* BurnDrvGetText(UINT32 i)
 
 				}
 				break;
-#endif // !defined(__LIBRETRO__) && !defined(BUILD_PI)
+#endif // !defined(__LIBRETRO__) && !defined(BUILD_SDL)
 			case DRV_COMMENT:
 				pszStringW = pDriver[nBurnDrvActive]->szCommentW;
 				break;
@@ -932,7 +932,7 @@ extern struct MovieExtInfo MovieInfo; // from replay.cpp
 void BurnGetLocalTime(tm *nTime)
 {
 	if (is_netgame_or_recording()) {
-#ifndef BUILD_PI
+#ifndef BUILD_SDL
 		if (is_netgame_or_recording() & 2) { // recording/playback
 			nTime->tm_sec = MovieInfo.second;
 			nTime->tm_min = MovieInfo.minute;
@@ -949,7 +949,7 @@ void BurnGetLocalTime(tm *nTime)
 			nTime->tm_wday = 3;
 			nTime->tm_mon = 6 - 1;
 			nTime->tm_year = 2018;
-#ifndef BUILD_PI
+#ifndef BUILD_SDL
 		}
 #endif
 	} else {

src/burner/sdl/burner_sdl.h

@@ -1,4 +1,4 @@
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 // defines to override various #ifndef _WIN32
 typedef struct tagRECT {

src/burner/sdl/config.cpp

@@ -4,7 +4,7 @@ int nIniVersion = 0;
 
 static void CreateConfigName(char* szConfig)
 {
-	memcpy(szConfig, "fbasdl.ini", 12);
+	memcpy(szConfig, "fbneo.ini", 12);
 	return;
 }
 

src/burner/sdl/main.cpp

@@ -39,14 +39,12 @@ int main(int argc, char *argv[])
 
 	BurnLibInit();
 
-	SDL_WM_SetCaption( "FBA, SDL port.", "FBA, SDL port.");
+	SDL_WM_SetCaption("FinalBurn Neo", "FinalBurn Neo");
 	SDL_ShowCursor(SDL_DISABLE);
 
 	if (argc < 2)
 	{
-		int c;
+		printf ("Usage: %1$s <romname>\n   ie: %1$s uopoko\n Note: no extension.\n\n", argv[0]);
-		printf ("Usage: fbasdl <romname>\n   ie: fbasdl uopoko\n Note: no extension.\n\n");
-
 		return 0;
 	}
 
@@ -66,7 +64,6 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	bBurnUseASMCPUEmulation = 0;
 	bCheatsAllowed = false;
 	ConfigAppLoad();
 	ConfigAppSave();
@@ -80,7 +77,7 @@ int main(int argc, char *argv[])
 
 	ConfigAppSave();
 	BurnLibExit();
-	//SDL_Quit();
+	SDL_Quit();
 
 	return 0;
 }

src/burner/sdl/run.cpp

@@ -221,33 +221,26 @@ static int RunExit()
 // The main message loop
 int RunMessageLoop()
 {
-	int bRestartVideo;
+    int quit = 0;
-	int finished= 0;
-	do {
-		bRestartVideo = 0;
 
     MediaInit();
-
     RunInit();
-
     GameInpCheckMouse();                                                            // Hide the cursor
-		while (!finished) {
+
+    while (!quit) {
         SDL_Event event;
-			if ( SDL_PollEvent(&event) ) {
+        while (SDL_PollEvent(&event)) {
             switch (event.type) {
                 case SDL_QUIT: /* Windows was closed */
-					finished=1;
+                    quit = 1;
                     break;
             }
         }
-			else 
+
-			{
         RunIdle();
     }
-		}
+
     RunExit();
-	} while (bRestartVideo);
 
     return 0;
 }
-

src/intf/audio/sdl/aud_sdl.cpp

@@ -1,6 +1,6 @@
 // SDL_Sound module
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 #include "burner.h"
 #include "aud_dsp.h"
 #include <math.h>

src/intf/input/pi/inp_pi.cpp

@@ -1,5 +1,5 @@
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 #include <unistd.h>
 #include <sys/time.h>
 

src/intf/input/sdl/inp_sdl.cpp

@@ -1,5 +1,5 @@
 // Module for input using SDL
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include "burner.h"
 #include "inp_sdl_keys.h"

src/intf/video/pi/vid_pi.cpp

@@ -8,7 +8,7 @@
 #include <interface/vchiq_arm/vchiq_if.h>
 #include <EGL/egl.h>
 #include <GLES2/gl2.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include "burner.h"
 

src/intf/video/sdl/vid_sdlopengl.cpp

@@ -3,9 +3,7 @@
 #include "vid_support.h"
 #include "vid_softfx.h"
 
-#include <GL/gl.h>
+#include <SDL_opengl.h>
-#include <GL/glu.h>
-#include <GL/glext.h>
 
 #ifdef frame_timer
 #include <sys/time.h>
@@ -263,7 +261,6 @@ static int Init()
 
 	screen = SDL_SetVideoMode(test_rect.right * nSize,
 				  test_rect.bottom * nSize, 32, SDL_OPENGL);
-	SDL_WM_SetCaption("FB Alpha", NULL);
 
 	// Initialize the buffer surfaces
 	BlitFXInit();