From d7f823958c3c838306a520a1e97a78c59673958a Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 5 Feb 2024 07:02:58 -0500
Subject: [PATCH] Remove define.cpp

---
 CMakeLists.txt   |  1 -
 ISLE/define.cpp  | 34 ----------------------------------
 ISLE/define.h    | 25 -------------------------
 ISLE/isleapp.cpp | 39 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 60 deletions(-)
 delete mode 100644 ISLE/define.cpp
 delete mode 100644 ISLE/define.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd2e2cd0..765cc68a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -415,7 +415,6 @@ set_property(TARGET lego1 PROPERTY SUFFIX ".DLL")
 if (ISLE_BUILD_APP)
   add_executable(isle WIN32
     ISLE/res/isle.rc
-    ISLE/define.cpp
     ISLE/isleapp.cpp
   )
 
diff --git a/ISLE/define.cpp b/ISLE/define.cpp
deleted file mode 100644
index 48fd907e..00000000
--- a/ISLE/define.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "define.h"
-
-// GLOBAL: ISLE 0x410030
-IsleApp* g_isle = 0;
-
-// GLOBAL: ISLE 0x410034
-unsigned char g_mousedown = 0;
-
-// GLOBAL: ISLE 0x410038
-unsigned char g_mousemoved = 0;
-
-// GLOBAL: ISLE 0x41003c
-int g_closed = 0;
-
-// GLOBAL: ISLE 0x410040
-RECT g_windowRect = {0, 0, 640, 480};
-
-// GLOBAL: ISLE 0x410050
-int g_rmDisabled = 0;
-
-// GLOBAL: ISLE 0x410054
-int g_waitingForTargetDepth = 1;
-
-// GLOBAL: ISLE 0x410058
-int g_targetWidth = 640;
-
-// GLOBAL: ISLE 0x41005c
-int g_targetHeight = 480;
-
-// GLOBAL: ISLE 0x410060
-int g_targetDepth = 16;
-
-// GLOBAL: ISLE 0x410064
-int g_reqEnableRMDevice = 0;
diff --git a/ISLE/define.h b/ISLE/define.h
deleted file mode 100644
index 6d1a59bb..00000000
--- a/ISLE/define.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef DEFINE_H
-#define DEFINE_H
-
-#include <mxtypes.h>
-#include <windows.h>
-
-class IsleApp;
-
-extern IsleApp* g_isle;
-extern int g_closed;
-// STRING: ISLE 0x4101c4
-#define WNDCLASS_NAME "Lego Island MainNoM App"
-// STRING: ISLE 0x4101dc
-#define WINDOW_TITLE "LEGO\xAE"
-extern unsigned char g_mousedown;
-extern unsigned char g_mousemoved;
-extern RECT g_windowRect;
-extern int g_rmDisabled;
-extern int g_waitingForTargetDepth;
-extern int g_targetWidth;
-extern int g_targetHeight;
-extern int g_targetDepth;
-extern int g_reqEnableRMDevice;
-
-#endif // DEFINE_H
diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 6901a298..2100d98d 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -26,6 +26,45 @@
 
 DECOMP_SIZE_ASSERT(IsleApp, 0x8c)
 
+// GLOBAL: ISLE 0x410030
+IsleApp* g_isle = 0;
+
+// GLOBAL: ISLE 0x410034
+unsigned char g_mousedown = 0;
+
+// GLOBAL: ISLE 0x410038
+unsigned char g_mousemoved = 0;
+
+// GLOBAL: ISLE 0x41003c
+int g_closed = 0;
+
+// GLOBAL: ISLE 0x410040
+RECT g_windowRect = {0, 0, 640, 480};
+
+// GLOBAL: ISLE 0x410050
+int g_rmDisabled = 0;
+
+// GLOBAL: ISLE 0x410054
+int g_waitingForTargetDepth = 1;
+
+// GLOBAL: ISLE 0x410058
+int g_targetWidth = 640;
+
+// GLOBAL: ISLE 0x41005c
+int g_targetHeight = 480;
+
+// GLOBAL: ISLE 0x410060
+int g_targetDepth = 16;
+
+// GLOBAL: ISLE 0x410064
+int g_reqEnableRMDevice = 0;
+
+// STRING: ISLE 0x4101c4
+#define WNDCLASS_NAME "Lego Island MainNoM App"
+
+// STRING: ISLE 0x4101dc
+#define WINDOW_TITLE "LEGO\xAE"
+
 // Might be static functions of IsleApp
 BOOL FindExistingInstance();
 BOOL StartDirectSound();