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

Rely on CxbxKrnl.h for CXBX_BASE_ADDR (avoiding a duplicate declaration)

This commit is contained in:
PatrickvL 2019-02-07 15:17:32 +01:00 committed by RadWolfie
parent c537539c6e
commit 3be54d4569
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emulator/CxbxEmulator.cpp
View File

@ -36,7 +36,7 @@
#include "Cxbx.h" // For FUNC_EXPORTS #include "Cxbx.h" // For FUNC_EXPORTS
#include "VerifyAddressRanges.h" #include "VerifyAddressRanges.h"
//#include "CxbxKrnl/CxbxKrnl.h" #include "core\kernel\init\CxbxKrnl.h" // For CXBX_BASE_ADDR
//#include "CxbxKrnl/Emu.h" //#include "CxbxKrnl/Emu.h"
#include "EmuShared.h" #include "EmuShared.h"
//#include <commctrl.h> //#include <commctrl.h>
@ -127,8 +127,6 @@ CommandLineToArgvA(
return argv; return argv;
} }
#define CXBX_BASE_ADDR 0x00010000
DWORD WINAPI Emulate(int system) DWORD WINAPI Emulate(int system)
{ {
FUNC_EXPORTS FUNC_EXPORTS