SDL build

.gitignore

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

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: fbasdl <romname>\n   ie: fbasdl uopoko\n Note: no extension.\n\n");
-
+		printf ("Usage: %1$s <romname>\n   ie: %1$s uopoko\n Note: no extension.\n\n", argv[0]);
 		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 finished= 0;
-	do {
-		bRestartVideo = 0;
+    int quit = 0;
 
-		MediaInit();
+    MediaInit();
+    RunInit();
+    GameInpCheckMouse();                                                            // Hide the cursor
 
-		RunInit();
+    while (!quit) {
+        SDL_Event event;
+        while (SDL_PollEvent(&event)) {
+            switch (event.type) {
+                case SDL_QUIT: /* Windows was closed */
+                    quit = 1;
+                    break;
+            }
+        }
 
-		GameInpCheckMouse();															// Hide the cursor
-		while (!finished) {
-			SDL_Event event;
-			if ( SDL_PollEvent(&event) ) {
-			switch (event.type) {
-				case SDL_QUIT: /* Windows was closed */
-					finished=1;
-					break;
-				}
-			}
-			else 
-			{
-				RunIdle();
-			}
-		}
-		RunExit();
-	} while (bRestartVideo);
+        RunIdle();
+    }
 
-	return 0;
+    RunExit();
+
+    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 <GL/glu.h>
-#include <GL/glext.h>
+#include <SDL_opengl.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();