From 9047206784d01311b1f58646fd49091196d77a99 Mon Sep 17 00:00:00 2001
From: LADSoft <touchstone222@runbox.com>
Date: Fri, 3 May 2024 21:49:54 -0400
Subject: [PATCH] adjust build of occ for linux

---
 src/netlib/NetCore.cpp | 2 +-
 src/netlib/makefile    | 4 ++++
 src/treetop.mak        | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/netlib/NetCore.cpp b/src/netlib/NetCore.cpp
index fc806b164..d9792976c 100644
--- a/src/netlib/NetCore.cpp
+++ b/src/netlib/NetCore.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include <Windows.h>
+#include <windows.h>
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/src/netlib/makefile b/src/netlib/makefile
index 04e030393..24177051c 100644
--- a/src/netlib/makefile
+++ b/src/netlib/makefile
@@ -30,9 +30,13 @@ INCLUDES=..$(PATHEXT2)util ..$(PATHEXT2)exefmt ..$(PATHEXT2)
 CPP_DEPENDENCIES=$(wildcard *.cpp)
 H_DEPENDENCIES=$(wildcard *.h)
 LIB_DEPENDENCIES=util libhostfxr
+
+ifneq "$(COMPILER)" "gcc-linux"
 DEFINES:=TARGET_OS_WINDOWS FALLBACK_HOST_OS=\"win10\" FEATURE_APPHOST TARGET_WINDOWS
 #fixme this next won't run in an x64 image....
 DEFINES:= $(DEFINES) TARGET_X86 CURRENT_ARCH_NAME=\"x86\"
+endif
+
 include ../redirect.mak
 NO_COMPARE=yes
 
diff --git a/src/treetop.mak b/src/treetop.mak
index 08fadfd44..7f787cae0 100644
--- a/src/treetop.mak
+++ b/src/treetop.mak
@@ -324,9 +324,9 @@ $(CDIRS): %.dirs :
 	-$(MKDIR) $*$(PATHEXT2)obj$(PATHEXT2)$(OBJ_IND_PATH) 2> $(NULLDEV)
 
 $(LIBS): %.library :
-	$(MAKE) library compile -f $(_TREEROOT) -C$*
+	$(MAKE) library compile -f $(_TREEROOT) -DCOMPILER=$(COMPILER) -C$*
 $(EXES): %.exefile : library
-	$(MAKE) exefile link -f $(_TREEROOT) -C$*
+	$(MAKE) exefile link -f $(_TREEROOT) -DCOMPILER=$(COMPILER) -C$*
 
 distribute_self:  cleanDISTRIBUTE
 	$(MAKE) DISTRIBUTE