ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

savedata: handle warioware touched (still gathering test cases, keep them coming) 

win32: fix vs2005 fastbuild output directory
This commit is contained in:
zeromus 2009-05-18 05:07:38 +00:00
parent fec0ae896e
commit 5e78d6a888
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desmume/src/mc.cpp
View File

@ -596,6 +596,7 @@ void BackupDevice::reset_command()
u32 autodetect_size = data_autodetect.size(); u32 autodetect_size = data_autodetect.size();
addr_size = autodetect_size - 1; addr_size = autodetect_size - 1;
if(autodetect_size==6) addr_size = 2; //castlevania dawn of sorrow 64kbit eeprom (EEPROM2 in the old system) if(autodetect_size==6) addr_size = 2; //castlevania dawn of sorrow 64kbit eeprom (EEPROM2 in the old system)
if(autodetect_size==258) addr_size = 2; //warioware touched
if(addr_size>4) if(addr_size>4)
{ {
LOG("Unexpected backup memory address size: %d\n",addr_size); LOG("Unexpected backup memory address size: %d\n",addr_size);

6
desmume/src/windows/DeSmuME_2005.vcproj
View File

@ -206,8 +206,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release FastBuild|Win32" Name="Release FastBuild|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)\__bins"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(SolutionDir)\.VS2005\$(ConfigurationName)\$(PlatformName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
WholeProgramOptimization="0" WholeProgramOptimization="0"
@ -267,7 +267,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2005-x32.lib zziplib-2005-x32.lib shlwapi.lib winpcap\wpcap.lib" AdditionalDependencies="vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2005-x32.lib zziplib-2005-x32.lib shlwapi.lib winpcap\wpcap.lib"
OutputFile="$(OutDir)\$(ProjectName)_release.exe" OutputFile="$(OutDir)\$(ProjectName)_releaseFastBuild.exe"
AdditionalLibraryDirectories=".\zlib123;.\zziplib" AdditionalLibraryDirectories=".\zlib123;.\zziplib"
DelayLoadDLLs="wpcap.dll" DelayLoadDLLs="wpcap.dll"
GenerateDebugInformation="true" GenerateDebugInformation="true"