From 75202e20d99ea4cdb886015d0fdb8d6f332b888e Mon Sep 17 00:00:00 2001
From: Diego Iastrubni <diegoiast@gmail.com>
Date: Sun, 14 Jun 2020 00:21:39 +0300
Subject: [PATCH] More compile fixes - upper case includes

---
 REDALERT/WIN32LIB/BUFFER.CPP   | 2 +-
 REDALERT/WIN32LIB/BUFFGLBL.CPP | 2 +-
 REDALERT/WIN32LIB/DIPTHONG.CPP | 3 +++
 REDALERT/WIN32LIB/DRAWRECT.CPP | 2 +-
 REDALERT/WIN32LIB/DrawMisc.cpp | 2 +-
 REDALERT/WIN32LIB/GBUFFER.CPP  | 2 +-
 REDALERT/WIN32LIB/IRANDOM.CPP  | 4 ++--
 REDALERT/WIN32LIB/MISC.H       | 9 +++++++--
 REDALERT/WIN32LIB/TOBUFF.CPP   | 2 +-
 REDALERT/WIN32LIB/wwstd.h      | 5 +++--
 10 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/REDALERT/WIN32LIB/BUFFER.CPP b/REDALERT/WIN32LIB/BUFFER.CPP
index 7affb08..9ba061a 100644
--- a/REDALERT/WIN32LIB/BUFFER.CPP
+++ b/REDALERT/WIN32LIB/BUFFER.CPP
@@ -35,7 +35,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #ifndef BUFFER_H
-#include "buffer.h"
+#include "BUFFER.H"
 #endif
 
 /*=========================================================================*/
diff --git a/REDALERT/WIN32LIB/BUFFGLBL.CPP b/REDALERT/WIN32LIB/BUFFGLBL.CPP
index 6c16b9d..161eec3 100644
--- a/REDALERT/WIN32LIB/BUFFGLBL.CPP
+++ b/REDALERT/WIN32LIB/BUFFGLBL.CPP
@@ -31,7 +31,7 @@
  *-------------------------------------------------------------------------*
  * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#include "gbuffer.h"
+#include "GBUFFER.H"
 
 /*=========================================================================*/
 /* The following PRIVATE functions are in this file:                       */
diff --git a/REDALERT/WIN32LIB/DIPTHONG.CPP b/REDALERT/WIN32LIB/DIPTHONG.CPP
index 7202f9b..f55b8dc 100644
--- a/REDALERT/WIN32LIB/DIPTHONG.CPP
+++ b/REDALERT/WIN32LIB/DIPTHONG.CPP
@@ -41,7 +41,10 @@
 
 //#include	"function.h"
 //#include	"ems.h"
+#ifdef WINDOWS
 #include <keyboard.h>
+#endif
+
 #include "dipthong.h"
 
 /***************************************************************************
diff --git a/REDALERT/WIN32LIB/DRAWRECT.CPP b/REDALERT/WIN32LIB/DRAWRECT.CPP
index beaaacd..50d0d2d 100644
--- a/REDALERT/WIN32LIB/DRAWRECT.CPP
+++ b/REDALERT/WIN32LIB/DRAWRECT.CPP
@@ -31,7 +31,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #ifndef GBUFFER_H
-#include "gbuffer.h"
+#include "GBUFFER.H"
 #include "misc.h"
 #endif
 
diff --git a/REDALERT/WIN32LIB/DrawMisc.cpp b/REDALERT/WIN32LIB/DrawMisc.cpp
index 8083d38..b22a378 100644
--- a/REDALERT/WIN32LIB/DrawMisc.cpp
+++ b/REDALERT/WIN32LIB/DrawMisc.cpp
@@ -32,7 +32,7 @@
 */
 
 #include <stdint.h>
-#include "gbuffer.h"
+#include "GBUFFER.H"
 #include "MISC.H"
 #include "WSA.H"
 
diff --git a/REDALERT/WIN32LIB/GBUFFER.CPP b/REDALERT/WIN32LIB/GBUFFER.CPP
index f9b9a4b..5452295 100644
--- a/REDALERT/WIN32LIB/GBUFFER.CPP
+++ b/REDALERT/WIN32LIB/GBUFFER.CPP
@@ -44,7 +44,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #ifndef GBUFFER_H
-#include "gbuffer.h"
+#include "GBUFFER.H"
 #include "misc.h"
 #endif
 //#pragma inline
diff --git a/REDALERT/WIN32LIB/IRANDOM.CPP b/REDALERT/WIN32LIB/IRANDOM.CPP
index 03b0bd0..ab19b38 100644
--- a/REDALERT/WIN32LIB/IRANDOM.CPP
+++ b/REDALERT/WIN32LIB/IRANDOM.CPP
@@ -31,7 +31,7 @@
 
 #include <stdlib.h>
 #include <time.h>
-#include "misc.h"
+#include "MISC.H"
 
 
 
@@ -180,4 +180,4 @@ RandNumb	DD	12349876H
 ;----------------------------------------------------------------------------
 
 	END
-#endif
\ No newline at end of file
+#endif
diff --git a/REDALERT/WIN32LIB/MISC.H b/REDALERT/WIN32LIB/MISC.H
index 8d4aafd..dff7682 100644
--- a/REDALERT/WIN32LIB/MISC.H
+++ b/REDALERT/WIN32LIB/MISC.H
@@ -34,13 +34,18 @@
 #ifndef MISC_H
 #define MISC_H
 
-#define WIN32_LEAN_AND_MEAN	// eliminates unecessary definitions in windows.h
+
 #ifndef _WIN32 // Denzil 6/2/98 Watcom 11.0 complains without this check
-#define _WIN32
+// NO! This is wtong
+//#define _WIN32
 #endif // _WIN32
+
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN	// eliminates unecessary definitions in windows.h
 #include <windows.h>
 #include <windowsx.h>
 //#include <ddraw.h>
+#endif
 
 /*========================= C++ Routines ==================================*/
 
diff --git a/REDALERT/WIN32LIB/TOBUFF.CPP b/REDALERT/WIN32LIB/TOBUFF.CPP
index ff729e8..63d6c54 100644
--- a/REDALERT/WIN32LIB/TOBUFF.CPP
+++ b/REDALERT/WIN32LIB/TOBUFF.CPP
@@ -15,7 +15,7 @@
  */
 
 #include <stdint.h>
-#include "gbuffer.h"
+#include "GBUFFER.H"
 #include "misc.h"
 
 long __cdecl Buffer_To_Buffer(GraphicViewPortClass* vp, int x, int y, int w, int h, void* buffer, int length)
diff --git a/REDALERT/WIN32LIB/wwstd.h b/REDALERT/WIN32LIB/wwstd.h
index 00b7674..7e0cf58 100644
--- a/REDALERT/WIN32LIB/wwstd.h
+++ b/REDALERT/WIN32LIB/wwstd.h
@@ -48,8 +48,9 @@
 #include <windows.h>
 #include <windowsx.h>
 #else
-#include <windows.h>
-#include <windowsx.h>
+// THIS BLOCK IS WHOLE WAYS OF WRONG
+// #include <windows.h>
+// #include <windowsx.h>
 #endif
 
 // Note: SKB 4/11/94