Fix project file

This commit is contained in:
Ian Curtis 2021-02-19 11:03:48 +00:00
parent f23b2f96f9
commit 0bfc2aea31
3 changed files with 48 additions and 10 deletions

View file

@ -61,7 +61,7 @@
#define ROM_SIZE 0x9000
#define RAM_SIZE 0x2000 // Z80 RAM
static_assert(sizeof(bool) == 1); // Save state code relies on this -- we must fix this so that bools are copied to uint8_t explicitly
static_assert(sizeof(bool) == 1, "bools must be copied to uint8_t"); // Save state code relies on this -- we must fix this so that bools are copied to uint8_t explicitly
void CDriveBoard::SaveState(CBlockFile* SaveState)
{
@ -145,7 +145,7 @@ void CDriveBoard::LoadState(CBlockFile* SaveState)
void CDriveBoard::LoadLegacyState(const LegacyDriveBoardState &state, CBlockFile *SaveState)
{
static_assert(RAM_SIZE == sizeof(state.ram));
static_assert(RAM_SIZE == sizeof(state.ram),"Ram sizes must match");
memcpy(m_ram, state.ram, RAM_SIZE);
m_initialized = state.initialized;
m_allowInterrupts = state.allowInterrupts;

View file

@ -327,7 +327,11 @@ xcopy /D /Y "$(ProjectDir)..\Config\*" "$(TargetDir)Config"</Command>
<ClCompile Include="..\Src\Model3\53C810Disasm.cpp" />
<ClCompile Include="..\Src\Model3\93C46.cpp" />
<ClCompile Include="..\Src\Model3\Crypto.cpp" />
<ClCompile Include="..\Src\Model3\DriveBoard.cpp" />
<ClCompile Include="..\Src\Model3\DriveBoard\BillBoard.cpp" />
<ClCompile Include="..\Src\Model3\DriveBoard\DriveBoard.cpp" />
<ClCompile Include="..\Src\Model3\DriveBoard\JoystickBoard.cpp" />
<ClCompile Include="..\Src\Model3\DriveBoard\SkiBoard.cpp" />
<ClCompile Include="..\Src\Model3\DriveBoard\WheelBoard.cpp" />
<ClCompile Include="..\Src\Model3\DSB.cpp" />
<ClCompile Include="..\Src\Model3\IRQ.cpp" />
<ClCompile Include="..\Src\Model3\JTAG.cpp" />
@ -498,7 +502,11 @@ xcopy /D /Y "$(ProjectDir)..\Config\*" "$(TargetDir)Config"</Command>
<ClInclude Include="..\Src\Model3\53C810.h" />
<ClInclude Include="..\Src\Model3\93C46.h" />
<ClInclude Include="..\Src\Model3\Crypto.h" />
<ClInclude Include="..\Src\Model3\DriveBoard.h" />
<ClInclude Include="..\Src\Model3\DriveBoard\BillBoard.h" />
<ClInclude Include="..\Src\Model3\DriveBoard\DriveBoard.h" />
<ClInclude Include="..\Src\Model3\DriveBoard\JoystickBoard.h" />
<ClInclude Include="..\Src\Model3\DriveBoard\SkiBoard.h" />
<ClInclude Include="..\Src\Model3\DriveBoard\WheelBoard.h" />
<ClInclude Include="..\Src\Model3\DSB.h" />
<ClInclude Include="..\Src\Model3\IRQ.h" />
<ClInclude Include="..\Src\Model3\JTAG.h" />

View file

@ -138,6 +138,12 @@
<Filter Include="Source Files\Network">
<UniqueIdentifier>{284c6ebd-9a90-4283-9ee6-ea097974c8f4}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Model3\DriveBoard">
<UniqueIdentifier>{2802dddb-302d-494a-9f0a-e37a870a7cc4}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Model3\DriveBoard">
<UniqueIdentifier>{5adb385b-66b5-4aec-9f7c-37a82388f0d2}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Src\BlockFile.cpp">
@ -194,9 +200,6 @@
<ClCompile Include="..\Src\Model3\93C46.cpp">
<Filter>Source Files\Model3</Filter>
</ClCompile>
<ClCompile Include="..\Src\Model3\DriveBoard.cpp">
<Filter>Source Files\Model3</Filter>
</ClCompile>
<ClCompile Include="..\Src\Model3\DSB.cpp">
<Filter>Source Files\Model3</Filter>
</ClCompile>
@ -437,6 +440,21 @@
<ClCompile Include="..\Src\Network\TCPReceive.cpp">
<Filter>Source Files\Network</Filter>
</ClCompile>
<ClCompile Include="..\Src\Model3\DriveBoard\BillBoard.cpp">
<Filter>Source Files\Model3\DriveBoard</Filter>
</ClCompile>
<ClCompile Include="..\Src\Model3\DriveBoard\DriveBoard.cpp">
<Filter>Source Files\Model3\DriveBoard</Filter>
</ClCompile>
<ClCompile Include="..\Src\Model3\DriveBoard\JoystickBoard.cpp">
<Filter>Source Files\Model3\DriveBoard</Filter>
</ClCompile>
<ClCompile Include="..\Src\Model3\DriveBoard\SkiBoard.cpp">
<Filter>Source Files\Model3\DriveBoard</Filter>
</ClCompile>
<ClCompile Include="..\Src\Model3\DriveBoard\WheelBoard.cpp">
<Filter>Source Files\Model3\DriveBoard</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<MASM Include="..\Src\CPU\68K\Turbo68K\Turbo68K.asm">
@ -523,9 +541,6 @@
<ClInclude Include="..\Src\Model3\93C46.h">
<Filter>Header Files\Model3</Filter>
</ClInclude>
<ClInclude Include="..\Src\Model3\DriveBoard.h">
<Filter>Header Files\Model3</Filter>
</ClInclude>
<ClInclude Include="..\Src\Model3\DSB.h">
<Filter>Header Files\Model3</Filter>
</ClInclude>
@ -799,6 +814,21 @@
<ClInclude Include="..\Src\Network\TCPReceive.h">
<Filter>Source Files\Network</Filter>
</ClInclude>
<ClInclude Include="..\Src\Model3\DriveBoard\BillBoard.h">
<Filter>Header Files\Model3\DriveBoard</Filter>
</ClInclude>
<ClInclude Include="..\Src\Model3\DriveBoard\DriveBoard.h">
<Filter>Header Files\Model3\DriveBoard</Filter>
</ClInclude>
<ClInclude Include="..\Src\Model3\DriveBoard\JoystickBoard.h">
<Filter>Header Files\Model3\DriveBoard</Filter>
</ClInclude>
<ClInclude Include="..\Src\Model3\DriveBoard\SkiBoard.h">
<Filter>Header Files\Model3\DriveBoard</Filter>
</ClInclude>
<ClInclude Include="..\Src\Model3\DriveBoard\WheelBoard.h">
<Filter>Header Files\Model3\DriveBoard</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\Src\Debugger\ReadMe.txt">