Merge pull request #19 from tmaul/master

First pass at renaming
finalburnneo · May 18, 2019 · 4ee08dd · 4ee08dd
2 parents 3e502a5 + 8078d51
commit 4ee08dd
Show file tree

Hide file tree

Showing 163 changed files with 1,341 additions and 1,335 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# FBAlphaFB
-http://neo-source.com
+# FinalBurn Neo
+Official Forum: http://neo-source.com
 
-This is the official repository of the FBAlphaFB Emulator.
+This is the official repository of the FinalBurn Neo Emulator.
 
 Use of this program and its source code is subject to the license conditions provided in the [license.txt](/src/license.txt) file in the src folder.
diff --git a/makefile b/makefile
@@ -1,4 +1,4 @@
-#	Main Makefile for FB Alpha, execute an appropriate system-specific makefile
+#	Main Makefile for FB Neo, execute an appropriate system-specific makefile
 
 export
 

diff --git a/makefile.mamemingw b/makefile.mamemingw
@@ -1,4 +1,4 @@
-# Makefile for FBA, for use with GNU make & GCC (MinGW)
+# Makefile for FBNeo, for use with GNU make & GCC (MinGW)
 #
 # 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
@@ -20,7 +20,7 @@ DEPEND = 1
 #
 
 # Specify the name of the executable file, without ".exe"
-NAME = fba
+NAME = fbneo
 COMPILENAME = 3
 
 ifdef BUILD_X64_EXE
@@ -212,7 +212,7 @@ ifdef FASTCALL
 endif
 
 ifdef DEBUG
-	DEF	:= $(DEF) -DFBA_DEBUG
+	DEF	:= $(DEF) -DFBNEO_DEBUG
 endif
 
 ifdef ROM_VERIFY

diff --git a/makefile.mingw b/makefile.mingw
@@ -20,7 +20,7 @@ DEPEND = 1
 #
 
 # Specify the name of the executable file, without ".exe"
-NAME = fba
+NAME = fbneo
 COMPILENAME = 3
 
 ifdef BUILD_X64_EXE
@@ -319,7 +319,7 @@ endif
 ifdef GCC452
 	CFLAGS  += -mconsole
 endif
-	DEF	:= $(DEF) -DFBA_DEBUG
+	DEF	:= $(DEF) -DFBNEO_DEBUG
 endif
 
 ifdef ROM_VERIFY

diff --git a/makefile.sdl b/makefile.sdl
@@ -9,7 +9,7 @@
 #
 
 # Specify the name of the executable file, without ".exe"
-NAME		= fbasdl
+NAME		= fbneosdl
 EXE		= $(NAME)
 INSTALLDIR	= /usr/local/games/fba/
 ROMDIR		= /usr/local/share/roms/

diff --git a/makefile.vc b/makefile.vc
@@ -16,7 +16,7 @@ unexport
 #
 
 # Specify the name of the executable file, without ".exe"
-NAME = fba
+NAME = fbneo
 COMPILENAME = 3
 
 ifdef BUILD_X64_EXE
@@ -194,7 +194,7 @@ ifdef FASTCALL
 endif
 
 ifdef DEBUG
-	DEF	:= $(DEF) /DFBA_DEBUG
+	DEF	:= $(DEF) /DFBNEO_DEBUG
 endif
 
 ifdef ROM_VERIFY

diff --git a/projectfiles/qtcreator/fba_qt.pro b/projectfiles/qtcreator/fba_qt.pro
@@ -43,7 +43,7 @@ GEN = $$SRC/dep/generated
 
 # We need ld
 FBA_LD = ld
-DEFINES += FBA_DEBUG
+DEFINES += FBNEO_DEBUG
 
 #-------------------------------------------------------------------------------
 # Dynamic recompilers

diff --git a/projectfiles/visualstudio-2010/fba_vs2010.vcxproj b/projectfiles/visualstudio-2010/fba_vs2010.vcxproj
@@ -1545,7 +1545,7 @@ rm build_details.exe
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\src\dep\libs\lib7z;..\..\src\burner\win32\resource;..\..\src\burn\drv\taito;..\..\src\burn\drv\misc_post90s;..\..\src\burn\devices;generated;..\..\src\intf\audio\win32;..\..\src\intf\audio;..\..\src\intf\;..\..\src\intf\video\scalers;..\..\src\intf\video\win32;..\..\src\intf\video;..\..\src\intf\perfcount\win32;..\..\src\intf\perfcount;..\..\src\intf\input\win32;..\..\src\intf\input;..\..\src\intf\cd\win32;..\..\src\intf\cd;..\..\src\intf;..\..\src\burner\win32;..\..\src\dep\libs\zlib;..\..\src\dep\libs\libpng;..\..\src\dep\libs;..\..\src\dep\kaillera\client;..\..\src\dep\kaillera;..\..\src\burn\snd;..\..\src\cpu;..\..\src\burner;..\..\src\burn;..\..\src\cpu\z80;..\..\src\cpu\sh2;..\..\src\cpu\s2650;..\..\src\cpu\nec;..\..\src\cpu\m6809;..\..\src\cpu\m6805;..\..\src\cpu\m6800;..\..\src\cpu\m6502;..\..\src\cpu\m68k;..\..\src\cpu\i8039;..\..\src\cpu\konami;..\..\src\cpu\hd6309;..\..\src\cpu\h6280;..\..\src\cpu\arm7;..\..\src\cpu\arm;..\..\src\cpu\g65816;..\..\src\cpu\spc700;..\..\src\cpu\i8051;..\..\src\cpu\tms32010;..\..\src\cpu\tms34010;..\..\src\cpu\i8x41;..\..\src\burn\drv\sega;..\..\src\burn\drv\dataeast;..\..\src\burn\drv\konami;..\..\src\cpu\z180;..\..\src\burn\drv\irem;..\..\src\cpu\upd7810;..\..\src\cpu\v60;..\..\src\cpu\upd7725;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>Default</CompileAs>
-      <PreprocessorDefinitions>BUILD_WIN32;FASTCALL;_DEBUG;FBA_DEBUG;LSB_FIRST;INLINE=__inline static;INCLUDE_LIB_PNGH;C_INLINE=__inline;MAME_INLINE=__inline static;_CRT_SECURE_NO_WARNINGS;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BUILD_WIN32;FASTCALL;_DEBUG;FBNEO_DEBUG;LSB_FIRST;INLINE=__inline static;INCLUDE_LIB_PNGH;C_INLINE=__inline;MAME_INLINE=__inline static;_CRT_SECURE_NO_WARNINGS;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/projectfiles/visualstudio-2019/fba_vs2010.vcxproj b/projectfiles/visualstudio-2019/fba_vs2010.vcxproj
@@ -1602,7 +1602,7 @@ del build_details.exe
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\src\dep\libs\lib7z;..\..\src\burner\win32\resource;..\..\src\burn\drv\taito;..\..\src\burn\drv\misc_post90s;..\..\src\burn\devices;generated;..\..\src\intf\audio\win32;..\..\src\intf\audio;..\..\src\intf\;..\..\src\intf\video\scalers;..\..\src\intf\video\win32;..\..\src\intf\video;..\..\src\intf\perfcount\win32;..\..\src\intf\perfcount;..\..\src\intf\input\win32;..\..\src\intf\input;..\..\src\intf\cd\win32;..\..\src\intf\cd;..\..\src\intf;..\..\src\burner\win32;..\..\src\dep\libs\zlib;..\..\src\dep\libs\libpng;..\..\src\dep\libs;..\..\src\dep\kaillera\client;..\..\src\dep\kaillera;..\..\src\burn\snd;..\..\src\cpu;..\..\src\burner;..\..\src\burn;..\..\src\cpu\z80;..\..\src\cpu\sh2;..\..\src\cpu\s2650;..\..\src\cpu\nec;..\..\src\cpu\m6809;..\..\src\cpu\m6805;..\..\src\cpu\m6800;..\..\src\cpu\m6502;..\..\src\cpu\m68k;..\..\src\cpu\i8039;..\..\src\cpu\konami;..\..\src\cpu\hd6309;..\..\src\cpu\h6280;..\..\src\cpu\arm7;..\..\src\cpu\arm;..\..\src\cpu\g65816;..\..\src\cpu\spc700;..\..\src\cpu\i8051;..\..\src\cpu\tms32010;..\..\src\cpu\tms34010;..\..\src\cpu\i8x41;..\..\src\burn\drv\sega;..\..\src\burn\drv\dataeast;..\..\src\burn\drv\konami;..\..\src\cpu\z180;..\..\src\burn\drv\irem;..\..\src\cpu\upd7810;..\..\src\cpu\v60;..\..\src\cpu\upd7725;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>Default</CompileAs>
-      <PreprocessorDefinitions>BUILD_WIN32;FASTCALL;_DEBUG;FBA_DEBUG;LSB_FIRST;INLINE=__inline static;INCLUDE_LIB_PNGH;C_INLINE=__inline;MAME_INLINE=__inline static;_CRT_SECURE_NO_WARNINGS;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BUILD_WIN32;FASTCALL;_DEBUG;FBNEO_DEBUG;LSB_FIRST;INLINE=__inline static;INCLUDE_LIB_PNGH;C_INLINE=__inline;MAME_INLINE=__inline static;_CRT_SECURE_NO_WARNINGS;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <EnablePREfast>true</EnablePREfast>
     </ClCompile>
     <Link>
@@ -1624,7 +1624,7 @@ del build_details.exe
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\src\dep\libs\lib7z;..\..\src\burner\win32\resource;..\..\src\burn\drv\taito;..\..\src\burn\drv\misc_post90s;..\..\src\burn\devices;generated;..\..\src\intf\audio\win32;..\..\src\intf\audio;..\..\src\intf\;..\..\src\intf\video\scalers;..\..\src\intf\video\win32;..\..\src\intf\video;..\..\src\intf\perfcount\win32;..\..\src\intf\perfcount;..\..\src\intf\input\win32;..\..\src\intf\input;..\..\src\intf\cd\win32;..\..\src\intf\cd;..\..\src\intf;..\..\src\burner\win32;..\..\src\dep\libs\zlib;..\..\src\dep\libs\libpng;..\..\src\dep\libs;..\..\src\dep\kaillera\client;..\..\src\dep\kaillera;..\..\src\burn\snd;..\..\src\cpu;..\..\src\burner;..\..\src\burn;..\..\src\cpu\z80;..\..\src\cpu\sh2;..\..\src\cpu\s2650;..\..\src\cpu\nec;..\..\src\cpu\m6809;..\..\src\cpu\m6805;..\..\src\cpu\m6800;..\..\src\cpu\m6502;..\..\src\cpu\m68k;..\..\src\cpu\i8039;..\..\src\cpu\konami;..\..\src\cpu\hd6309;..\..\src\cpu\h6280;..\..\src\cpu\arm7;..\..\src\cpu\arm;..\..\src\cpu\g65816;..\..\src\cpu\spc700;..\..\src\cpu\i8051;..\..\src\cpu\tms32010;..\..\src\cpu\tms34010;..\..\src\cpu\i8x41;..\..\src\burn\drv\sega;..\..\src\burn\drv\dataeast;..\..\src\burn\drv\konami;..\..\src\cpu\z180;..\..\src\burn\drv\irem;..\..\src\cpu\upd7810;..\..\src\cpu\v60;..\..\src\cpu\upd7725;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>Default</CompileAs>
-      <PreprocessorDefinitions>FBA_DEBUG;BUILD_WIN32;FASTCALL;_MBCS;LSB_FIRST;INLINE=__inline static;INCLUDE_LIB_PNGH;C_INLINE=__inline;MAME_INLINE=__inline static;_CRT_SECURE_NO_WARNINGS;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;BUILD_X64_EXE;XBYAK_NO_OP_NAMES;MIPS3_X64_DRC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>FBNEO_DEBUG;BUILD_WIN32;FASTCALL;_MBCS;LSB_FIRST;INLINE=__inline static;INCLUDE_LIB_PNGH;C_INLINE=__inline;MAME_INLINE=__inline static;_CRT_SECURE_NO_WARNINGS;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;BUILD_X64_EXE;XBYAK_NO_OP_NAMES;MIPS3_X64_DRC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/src/burn/burn.cpp b/src/burn/burn.cpp
@@ -26,7 +26,13 @@ bool bBurnUseMMX;
 bool bBurnUseASMCPUEmulation = false;
 #endif
 
-#if defined (FBA_DEBUG)
+// Just so we can start using FBNEO_DEBUG and keep backwards compatablity should whatever is left of FB Alpha rise from it's grave. 
+#if defined (FBNEO_DEBUG) && (!defined FBA_DEBUG)
+#define FBA_DEBUG 1
+#endif
+
+
+#if defined (FBNEO_DEBUG)
  clock_t starttime = 0;
 #endif
 
@@ -594,7 +600,7 @@ extern "C" INT32 BurnDrvInit()
 		return 1;
 	}
 
-#if defined (FBA_DEBUG)
+#if defined (FBNEO_DEBUG)
 	{
 		TCHAR szText[1024] = _T("");
 		TCHAR* pszPosition = szText;
@@ -650,7 +656,7 @@ extern "C" INT32 BurnDrvInit()
 
 	nCurrentFrame = 0;
 
-#if defined (FBA_DEBUG)
+#if defined (FBNEO_DEBUG)
 	if (!nReturnValue) {
 		starttime = clock();
 		nFramesEmulated = 0;
@@ -666,7 +672,7 @@ extern "C" INT32 BurnDrvInit()
 // Exit game emulation
 extern "C" INT32 BurnDrvExit()
 {
-#if defined (FBA_DEBUG)
+#if defined (FBNEO_DEBUG)
 	if (starttime) {
 		clock_t endtime;
 		clock_t nElapsedSecs;
@@ -692,7 +698,7 @@ extern "C" INT32 BurnDrvExit()
 	INT32 nRet = pDriver[nBurnDrvActive]->Exit();			// Forward to drivers function
 
 	BurnExitMemoryManager();
-#if defined FBA_DEBUG
+#if defined FBNEO_DEBUG
 	DebugTrackerExit();
 #endif
 
@@ -717,7 +723,7 @@ INT32 BurnDrvCartridgeSetup(BurnCartrigeCommand nCommand)
 
 	BurnExtCartridgeSetupCallback(CART_INIT_END);
 
-#if defined FBA_DEBUG
+#if defined FBNEO_DEBUG
 		bprintf(PRINT_NORMAL, _T("  * Loading"));
 #endif
 
@@ -927,7 +933,7 @@ double BurnGetTime()
 // ----------------------------------------------------------------------------
 // Wrapper for MAME logerror calls
 
-#if defined (FBA_DEBUG) && defined (MAME_USE_LOGERROR)
+#if defined (FBNEO_DEBUG) && defined (MAME_USE_LOGERROR)
 void logerror(char* szFormat, ...)
 {
 	static char szLogMessage[1024];
@@ -945,7 +951,7 @@ void logerror(char* szFormat, ...)
 }
 #endif
 
-#if defined (FBA_DEBUG)
+#if defined (FBNEO_DEBUG)
 void BurnDump_(char *filename, UINT8 *buffer, INT32 bufsize)
 {
     FILE *f = fopen(filename, "wb+");

diff --git a/src/burn/burn.h b/src/burn/burn.h
@@ -1,4 +1,4 @@
-// FB Alpha FB - Emulator for MC68000/Z80 based arcade games
+// FinalBurn Neo - Emulator for MC68000/Z80 based arcade games
 //            Refer to the "license.txt" file for more info
 
 // Burner emulation library
@@ -312,7 +312,7 @@ INT32 BurnSynchroniseStream(INT32 nSoundRate);
 double BurnGetTime();
 
 // Handy debug binary-file dumper
-#if defined (FBA_DEBUG)
+#if defined (FBNEO_DEBUG)
 void BurnDump_(char *filename, UINT8 *buffer, INT32 bufsize);
 #define BurnDump(fn, b, bs) do { \
     bprintf(0, _T("Dumping %S (0x%x bytes) to %S\n"), #b, bs, #fn); \