adjust build of occ for linux

LADSoft · May 4, 2024 · 9047206 · 9047206
1 parent e9129cc
commit 9047206
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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