diff --git a/projectfiles/visualstudio-2010/fba_vs2010.vcxproj b/projectfiles/visualstudio-2010/fba_vs2010.vcxproj index 8c345cafe..1a549080b 100644 --- a/projectfiles/visualstudio-2010/fba_vs2010.vcxproj +++ b/projectfiles/visualstudio-2010/fba_vs2010.vcxproj @@ -18,6 +18,879 @@ x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Default + + + Default + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ..\..\src\burner\;%(AdditionalIncludeDirectories) + + + {86D06C32-A849-4988-A176-A38D014C36C1} fba_vs2010 @@ -62,7 +935,7 @@ - src\depend\vs2010\include;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath) + ..\..\src\dep\vc\include;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath) $(SolutionDir)$(Configuration)\ @@ -72,9 +945,9 @@ Level3 Disabled - src\burner\win32\resource;src\burn\drivers\taito;src\burn\drivers\misc_post90s;src\burn\devices;src\depend\generated;src\interface\scalers;src\interface\win32\resource;src\interface\win32;src\interface;src\burner\win32;src\depend\libs\zlib;src\depend\libs\libpng;src\depend\libs;src\depend\kaillera\client;src\depend\kaillera;src\burn\sound;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;%(AdditionalIncludeDirectories) - CompileAsCpp - BUILD_WIN32;FASTCALL;_DEBUG;FBA_DEBUG;%(PreprocessorDefinitions) + ..\..\src\dep\libs\lib7z;..\..\src\burner\win32\resource;..\..\src\burn\drv\taito;..\..\src\burn\drv\misc_post90s;..\..\src\burn\devices;..\..\src\dep\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;%(AdditionalIncludeDirectories) + Default + BUILD_WIN32;FASTCALL;_DEBUG;FBA_DEBUG;LSB_FIRST;INLINE=__inline static;INCLUDE_LIB_PNGH;C_INLINE=__inline;MAME_INLINE=__inline static;%(PreprocessorDefinitions) true @@ -84,7 +957,7 @@ false - $(MSBuildProjectDirectory)/src/depend/vs2010/pre.bat "$(VCInstallDir) + $(MSBuildProjectDirectory)/../../src/dep/vs2010/pre.bat "$(VCInstallDir) @@ -135,885 +1008,6 @@ user32.lib;gdi32.lib;comdlg32.lib;comctl32.lib;shell32.lib;winmm.lib;ole32.lib;shlwapi.lib;advapi32.lib;setupapi.lib;d3d9.lib;d3dx9.lib;dsound.lib;dinput8.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CompileAsC - CompileAsC - - - - - - - - - - - - - - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - - - - - - - - - - - - - - - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - - - - - - - - - - - - - - - - - - - - - - - - CompileAsCpp - CompileAsCpp - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - src\depend\generated;src\burner;src\burn;%(AdditionalIncludeDirectories) - src\depend\generated;src\burner;src\burn;%(AdditionalIncludeDirectories) - - - - - diff --git a/projectfiles/visualstudio-2010/fba_vs2010.vcxproj.filters b/projectfiles/visualstudio-2010/fba_vs2010.vcxproj.filters index c0650db7c..63855e2c2 100644 --- a/projectfiles/visualstudio-2010/fba_vs2010.vcxproj.filters +++ b/projectfiles/visualstudio-2010/fba_vs2010.vcxproj.filters @@ -1,765 +1,2761 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cps3 + + + Burn\drv\dataeast + + + Burn\drv\galaxian + + + Burn\drv\irem + + + Burn\drv\konami + + + Burn\drv\megadrive + + + Burn\drv\neogeo + + + Burn\drv\neogeo + + + Burn\drv\neogeo + + + Burn\drv\pce + + + Burn\drv\pgm + + + Burn\drv\psikyo + + + Burn\drv\psikyo + + + Burn\drv\psikyo + + + Burn\drv\psikyo + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\snes + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus\arm7 + + + cpus\h6280 + + + cpus\h6280 + + + cpus\hd6309 + + + cpus\i8039 + + + cpus\konami + + + cpus\m6502 + + + cpus\m6502 + + + cpus\m6502 + + + cpus\m6502 + + + cpus\m6502 + + + cpus\m6800 + + + cpus\m6805 + + + cpus + + + cpus\nec + + + cpus\nec + + + cpus\nec + + + cpus\nec + + + cpus\nec + + + cpus\nec + + + cpus\nec + + + cpus\nec + + + cpus\s2650 + + + cpus + + + cpus + + + cpus\m68k + + + burner + + + burner + + + burner + + + burner + + + burner + + + burner + + + burner + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + interfaces + + + interfaces\audio + + + interfaces\audio + + + interfaces\audio\win32 + + + interfaces\cd + + + interfaces\cd\win32 + + + interfaces\input + + + interfaces\input\win32 + + + interfaces\video + + + interfaces\video + + + interfaces\video\win32 + + + interfaces\video\win32 + + + interfaces\video\win32 + + + interfaces\video\win32 + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + shitty networking code + + + shitty networking code + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\snd + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\devices + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\capcom + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cave + + + Burn\drv\cps3 + + + Burn\drv\cps3 + + + Burn\drv\cps3 + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\dataeast + + + Burn\drv\galaxian + + + Burn\drv\galaxian + + + Burn\drv\galaxian + + + Burn\drv\galaxian + + + Burn\drv\galaxian + + + Burn\drv\irem + + + Burn\drv\irem + + + Burn\drv\irem + + + Burn\drv\irem + + + Burn\drv\irem + + + Burn\drv\irem + + + Burn\drv\irem + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\konami + + + Burn\drv\megadrive + + + Burn\drv\megadrive + + + Burn\drv\neogeo + + + Burn\drv\neogeo + + + Burn\drv\neogeo + + + Burn\drv\neogeo + + + Burn\drv\neogeo + + + Burn\drv\neogeo + + + Burn\drv\neogeo + + + Burn\drv\neogeo + + + Burn\drv\pce + + + Burn\drv\pce + + + Burn\drv\pgm + + + Burn\drv\pgm + + + Burn\drv\pgm + + + Burn\drv\pgm + + + Burn\drv\pgm + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\pre90s + + + Burn\drv\psikyo + + + Burn\drv\psikyo + + + Burn\drv\psikyo + + + Burn\drv\psikyo + + + Burn\drv\psikyo + + + Burn\drv\psikyo + + + Burn\drv\psikyo + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\post90s + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\sega + + + Burn\drv\snes + + + Burn\drv\snes + + + Burn\drv\snes + + + Burn\drv\snes + + + Burn\drv\snes + + + Burn\drv\snes + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\taito + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + Burn\drv\toaplan + + + cpus\arm + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus + + + cpus\arm7 + + + cpus\h6280 + + + cpus\hd6309 + + + cpus\i8039 + + + cpus\konami + + + cpus\m6502 + + + cpus\m6800 + + + cpus\m6805 + + + cpus\nec + + + cpus\nec + + + cpus\s2650 + + + cpus\sh2 + + + cpus + + + cpus + + + cpus\m68k + + + cpus\m68k + + + cpus\m68k + + + cpus\m68k + + + cpus\m68k + + + cpus\m6809 + + + burner + + + burner + + + burner + + + burner + + + burner + + + burner + + + burner + + + burner + + + burner + + + burner + + + burner + + + burner + + + burner + + + burner + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + burner\win32 + + + interfaces + + + interfaces\audio + + + interfaces\audio + + + interfaces\audio + + + interfaces\audio\win32 + + + interfaces\audio\win32 + + + interfaces\audio\win32 + + + interfaces\cd + + + interfaces\cd\win32 + + + interfaces\cd\win32 + + + interfaces\input + + + interfaces\input\win32 + + + interfaces\input\win32 + + + interfaces\video + + + interfaces\video + + + interfaces\video + + + interfaces\video\win32 + + + interfaces\video\win32 + + + interfaces\video\win32 + + + interfaces\video\win32 + + + interfaces\video\win32 + + + interfaces\video\win32 + + + interfaces\video\win32 + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\perf + + + interfaces\perf\win32 + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\zlib + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\libpng + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + libs\7z + + + cpus\m68k + + + shitty networking code + - - - - - - - - + + {20c66404-b041-4c1c-92d5-e247bed49381} + + + {6fb047bd-f52c-4c9e-aafe-1a083b0b5e7b} + + + {be891496-733a-468e-b938-3a04ff7da28e} + + + {157177a2-3cd7-44b7-abe0-2f7b96b670f6} + + + {35dfe3ae-1f3b-4f8c-8362-670dd008d911} + + + {bdc4c8f8-e20e-4ee1-ac54-51563fdeff45} + + + {4fd52931-a65f-49a4-aae5-521161f7a82a} + + + {c16fd15f-a44a-4691-94ad-0f7bc7199f3d} + + + {c4b93ffc-1f2a-4461-a73b-d7153fd1a1e6} + + + {0937431a-c5c3-4079-86ff-f553d99ef136} + + + {c9f79ec1-aa17-4960-ae86-875f4946c39c} + + + {921dd117-a8fb-4b7c-beba-816870ec29b1} + + + {15e73a36-20e3-4787-9098-93110d20385d} + + + {6c7e826a-8962-479c-8584-38f4c4bda59f} + + + {14559fe7-78ad-4e5d-9fde-0a27cfebe3f2} + + + {1ee2e0f5-6bec-41dd-8b09-f110a36e0fbd} + + + {e84ef75c-1e60-48a1-b3a7-c4c007594961} + + + {ea0abb96-fbd6-4b68-b495-ffdc0d9b007e} + + + {33f8a601-1bcb-458c-8818-aff159407b66} + + + {92c33e19-ba3d-48e8-aaa5-0be3efbbd9bb} + + + {cfa988bf-dda1-4336-b896-65c08a977e45} + + + {ec5d82b7-2cb0-4fb4-a5dc-16ab24a692c8} + + + {63ac0368-033b-4bab-ab4f-a4e2f2480828} + + + {ac9d3e68-c859-431c-afcf-a45a59bde41f} + + + {181a963c-900f-43fe-88c7-76b3ca2db96a} + + + {2f6c4a65-24db-4b48-a4bc-5f3dc417ce2a} + + + {022cec73-4f7c-4e2b-b5ae-961baf57059a} + + + {7f799802-3d11-4d1b-a292-44e8081c8506} + + + {d8cca765-414c-4d1f-b707-0fcce579f63f} + + + {bd20b85f-0fc1-48e9-9300-5512f0b48d32} + + + {7b46bc32-63cc-4d07-926c-6521e5e3734a} + + + {b75322ce-7e8d-4ebb-9417-0c21fc7ca996} + + + {30900300-8680-4de9-949f-e5730750f260} + + + {38ae639d-7a13-425e-8992-6ccfb38ebff9} + + + {abfb0299-f5db-42c5-9d0e-8d4f719efcc5} + + + {bb4aef48-9a9c-44da-95e9-c62d6e6b026f} + + + {258c1673-602b-41dc-b192-6ef0c1c21e99} + + + {3c2c0e48-8c0b-4de2-bc84-a6b2ad8dd9df} + + + {c1631cbb-48f8-4fcd-9b5d-f978c18d97e1} + + + {216c2b82-0104-409a-98c6-c6368441eb39} + + + {7bc6d679-0841-4db6-b257-8070b73933b9} + + + {7caa12c1-b685-4ae8-964a-dc887e3b0aa4} + + + {fb178d63-1f81-415e-8cd7-a48079015c54} + + + {8d48ac20-3c2b-4c0a-b151-8e9f55f8a55a} + + + {688e8e7c-7d25-4fb2-8b08-99830cf36885} + + + {ac6b8038-053a-4b04-a976-516b7cf1c6a7} + + + {ec55b2b2-6ba4-4d8e-ae94-9aa7cba90fd0} + + + {77a52c8d-cc17-42bd-bb06-f256cef06e7a} + + + {71d3f67e-bf57-4151-a259-00d382e81c46} + + + {c9aa7869-9ab8-4b00-8662-d8972e1967f0} + + + {f88c916d-3b4e-4035-91f9-b395dbf046e1} + + + {3d547c1f-d964-4d1b-bb82-71e414c1a83f} + + + {3a50b1b9-d941-4370-b3f0-33fec23251ad} + + + {6b4ef829-71a4-4561-81d3-e4c25f7a8f40} + + + {f7d4de4f-dfdc-43b3-a668-f4acd52b2a23} + + + {16c81b29-859d-4d57-963e-e6e08ba76fdb} + + + {9cda8029-cb8c-41ad-821d-ea5f7689041d} + - + + Burn + + + interfaces\video\win32\resource + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + interfaces\video\scalers + + + libs\zlib + + + libs\libpng + + + libs\7z + - + + burner\win32 + + + libs\7z + \ No newline at end of file diff --git a/src/burn/snd/ym2413.c b/src/burn/snd/ym2413.c index d0b22bb04..cb8d94be8 100644 --- a/src/burn/snd/ym2413.c +++ b/src/burn/snd/ym2413.c @@ -30,9 +30,11 @@ to do: #include "state.h" #include "ym2413.h" +#ifndef MAME_INLINE #ifndef MAME_INLINE #define MAME_INLINE static inline #endif +#endif #ifndef PI #define PI 3.14159265358979323846 diff --git a/src/burn/state.h b/src/burn/state.h index c92e70e5f..bcd57aad2 100644 --- a/src/burn/state.h +++ b/src/burn/state.h @@ -7,8 +7,10 @@ #if !defined(__cplusplus) && defined(_XBOX) #define C_INLINE _inline #else +#ifndef C_INLINE #define C_INLINE inline #endif +#endif /* Scan driver data */ INT32 BurnAreaScan(INT32 nAction, INT32* pnMin); diff --git a/src/burner/win32/about.cpp b/src/burner/win32/about.cpp index 13a587cf4..e78355e65 100644 --- a/src/burner/win32/about.cpp +++ b/src/burner/win32/about.cpp @@ -105,8 +105,11 @@ static bool AboutDrawStrings(unsigned int nControlID, LPDRAWITEMSTRUCT pdis) RECT rect = pdis->rcItem; rect.top += 1; - +#ifdef MMX _stprintf(szBuild, _T("built on ") _T(MAKE_STRING(BUILD_DATE)) _T(", ") _T(MAKE_STRING(BUILD_TIME)) _T(" (") _T(MAKE_STRING(BUILD_CHAR)) _T(", ") _T(MAKE_STRING(BUILD_COMP)) _T(", ") _T(MAKE_STRING(BUILD_CPU)) _T("%s)"), MMX ? _T(", MMX") : _T("")); +#else + _stprintf(szBuild, _T("built on ") _T(MAKE_STRING(BUILD_DATE)) _T(", ") _T(MAKE_STRING(BUILD_TIME)) _T(" (") _T(MAKE_STRING(BUILD_CHAR)) _T(", ") _T(MAKE_STRING(BUILD_COMP)) _T(", ") _T(MAKE_STRING(BUILD_CPU)) _T("%s)"), _T("")); +#endif myDrawText(pdis->hDC, &rect, szBuild, -2, RGB(0xDB, 0xDB, 0xDB), DT_CENTER); #endif diff --git a/src/burner/win32/burner_win32.h b/src/burner/win32/burner_win32.h index 73b578526..6e53f0086 100644 --- a/src/burner/win32/burner_win32.h +++ b/src/burner/win32/burner_win32.h @@ -14,8 +14,10 @@ #define STRICT #if defined (_UNICODE) +#ifndef UNICODE #define UNICODE #endif +#endif #define WIN32_LEAN_AND_MEAN #define OEMRESOURCE diff --git a/src/dep/kaillera/client/net.cpp b/src/dep/kaillera/client/net.cpp index 7513a01b6..e27f96dc0 100644 --- a/src/dep/kaillera/client/net.cpp +++ b/src/dep/kaillera/client/net.cpp @@ -58,7 +58,13 @@ int WINAPI Empty_Kaillera_End_Game() int Init_Network(void) { - Kaillera_HDLL = LoadLibrary("kailleraclient.dll"); + #if defined (_UNICODE) + Kaillera_HDLL = LoadLibrary(L"kailleraclient.dll"); + #else + Kaillera_HDLL = LoadLibrary("kailleraclient.dll"); + #endif + + if (Kaillera_HDLL != NULL) { diff --git a/src/dep/vs2010/pre.bat b/src/dep/vs2010/pre.bat index 114fc135e..1b5a406b1 100644 --- a/src/dep/vs2010/pre.bat +++ b/src/dep/vs2010/pre.bat @@ -1,7 +1,8 @@ @echo off -cd src/depend +cd ..\..\src\dep\ mkdir generated cd scripts +echo %CD% echo running perl scripts perl cave_sprite_func.pl -o ../generated/cave_sprite_func.h perl license2rtf.pl -o ../generated/license.rtf ../../license.txt @@ -9,20 +10,24 @@ perl cave_tile_func.pl -o ../generated/cave_tile_func.h perl neo_sprite_func.pl -o ../generated/neo_sprite_func.h perl psikyo_tile_func.pl -o ../generated/psikyo_tile_func.h perl toa_gp9001_func.pl -o ../generated/toa_gp9001_func.h -perl gamelist.pl -o ../generated/driverlist.h -l ../../gamelist.txt ../../burn/drivers/capcom ../../burn/drivers/cave ../../burn/drivers/cps3 ../../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/taito ../../burn/drivers/toaplan ../../burn/drivers/snes +perl gamelist.pl -o ../generated/driverlist.h -l ../../gamelist.txt ../../burn/drv/capcom ../../burn/drv/cave ../../burn/drv/cps3 ../../burn/drv/dataeast ../../burn/drv/galaxian ../../burn/drv/irem ../../burn/drv/konami ../../burn/drv/megadrive ../../burn/drv/neogeo ../../burn/drv/pce ../../burn/drv/pgm ../../burn/drv/pst90s ../../burn/drv/pre90s ../../burn/drv/psikyo ../../burn/drv/sega ../../burn/drv/taito ../../burn/drv/toaplan ../../burn/drv/snes + +echo %CD% echo building buildinfo %1/bin/cl" build_details.cpp build_details > ../generated/build_details.h del build_details.exe del build_details.obj + echo building ctv cd .. cd .. cd burn -cd drivers +cd drv cd capcom +echo %CD% %1/bin/cl" ctv_make.cpp -ctv_make > ../../../depend/generated/ctv.h +ctv_make > ../../../dep/generated/ctv.h del ctv_make.exe del ctv_make.obj @@ -32,8 +37,9 @@ cd .. cd .. cd cpu cd m68k +echo %CD% %1/bin/cl" /DINLINE="__inline static" m68kmake.c -m68kmake ../../depend/generated/ m68k_in.c +m68kmake ../../dep/generated/ m68k_in.c del m68kmake.exe del m68kmake.obj