From 3be54d4569ac1bf19405329689bc7fbd05832c50 Mon Sep 17 00:00:00 2001
From: PatrickvL <pvanlogchem@gmail.com>
Date: Thu, 7 Feb 2019 15:17:32 +0100
Subject: [PATCH] Rely on CxbxKrnl.h for CXBX_BASE_ADDR (avoiding a duplicate
 declaration)

---
 src/emulator/CxbxEmulator.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/emulator/CxbxEmulator.cpp b/src/emulator/CxbxEmulator.cpp
index 7d0e389b3..7b2014be8 100644
--- a/src/emulator/CxbxEmulator.cpp
+++ b/src/emulator/CxbxEmulator.cpp
@@ -36,7 +36,7 @@
 
 #include "Cxbx.h" // For FUNC_EXPORTS
 #include "VerifyAddressRanges.h"
-//#include "CxbxKrnl/CxbxKrnl.h"
+#include "core\kernel\init\CxbxKrnl.h" // For CXBX_BASE_ADDR
 //#include "CxbxKrnl/Emu.h"
 #include "EmuShared.h"
 //#include <commctrl.h>
@@ -127,8 +127,6 @@ CommandLineToArgvA(
 	return argv;
 }
 
-#define CXBX_BASE_ADDR 0x00010000
-
 DWORD WINAPI Emulate(int system)
 {
 	FUNC_EXPORTS