Ensure the Cxbx Kernel .dll is labelled correctly throughout, taking the opportunity to simplify the Release and Debug branches. Bump version number as well.

src/Cxbx.h

@@ -84,9 +84,9 @@ typedef signed long    sint32;
 
 /*! version string dependent on trace flag */
 #ifndef _DEBUG_TRACE
-#define _CXBX_VERSION "0.8.1-Pre2"
+#define _CXBX_VERSION "0.8.1-Pre3"
 #else
-#define _CXBX_VERSION "0.8.1-Pre2-Trace"
+#define _CXBX_VERSION "0.8.1-Pre3-Trace"
 #endif
 
 /*! debug mode choices */

src/Cxbx/EmuExe.cpp

@@ -448,11 +448,7 @@ EmuExe::EmuExe(Xbe *x_Xbe, DebugMode x_debug_mode, char *x_debug_filename, HWND
             *(uint32*)&m_bzSection[i][0x34] = 0;
             *(uint16*)&m_bzSection[i][0x38] = 0x0001;
 
-            #ifdef _DEBUG
             memcpy(&m_bzSection[i][0x3A], "CxbxKrnlNoFunc\0\0CxbxKrnl.dll\0\0", 30);
-            #else
-            memcpy(&m_bzSection[i][0x3A], "CxbxKrnlNoFunc\0\0Cxbx.dll\0\0\0\0\0\0", 30);
-            #endif
 
             printf("OK\n");
         }

src/Cxbx/WinMain.cpp

@@ -43,10 +43,10 @@
 /*! program entry point */
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
-    /*! verify Cxbx.dll is the same version as Cxbx.exe */
+    /*! verify CxbxKrnl.dll is the same version as Cxbx.exe */
     if(!CxbxKrnlVerifyVersion(_CXBX_VERSION))
     {
-        MessageBox(NULL, "Cxbx.dll is the incorrect version", "Cxbx", MB_OK);
+        MessageBox(NULL, "CxbxKrnl.dll is the incorrect version", "Cxbx", MB_OK);
         return 1;
     }
 

src/Cxbx/Wnd.cpp

@@ -69,11 +69,8 @@ bool Wnd::ProcessMessages()
     // initialize window
     if(!m_initialized)
     {
-#ifdef _DEBUG
         HMODULE hCxbxDll = GetModuleHandle("CxbxKrnl.dll");
-#else
-        HMODULE hCxbxDll = GetModuleHandle("Cxbx.dll");
-#endif
+
         m_initialized = true;
 
         WNDCLASS wnd_class;

src/Cxbx/WndMain.cpp

@@ -1866,7 +1866,7 @@ void WndMain::StartEmulation(EnumAutoConvert x_AutoConvert, HWND hwndParent)
         }
     }
 
-    // register xbe path with Cxbx.dll
+    // register xbe path with CxbxKrnl.dll
     g_EmuShared->SetXbePath(m_Xbe->m_szPath);
 
     // shell exe

src/CxbxKrnl/EmuD3D8.cpp

@@ -294,11 +294,7 @@ static DWORD WINAPI EmuRenderWindow(LPVOID lpVoid)
 
     // register window class
     {
-        #ifdef _DEBUG
         HMODULE hCxbxDll = GetModuleHandle("CxbxKrnl.dll");
-        #else
-        HMODULE hCxbxDll = GetModuleHandle("Cxbx.dll");
-        #endif
 
         LOGBRUSH logBrush = {BS_SOLID, RGB(0,0,0)};