From f9c72a37b007331161f5c73122b43bcd38a8865a Mon Sep 17 00:00:00 2001
From: David Brown <dave.github@brownsmeet.com>
Date: Mon, 14 Nov 2016 21:25:04 +0000
Subject: [PATCH] Fix mingw build.

---
 src/compiler/OPM.Mod     | 29 +----------------------------
 src/tools/make/oberon.mk |  3 +--
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/compiler/OPM.Mod b/src/compiler/OPM.Mod
index 02439e66..f0d5087b 100644
--- a/src/compiler/OPM.Mod
+++ b/src/compiler/OPM.Mod
@@ -435,6 +435,7 @@ MODULE OPM;  (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96  *)
     LogWStr("  ");
 
     IF Errors = NIL THEN NEW(Errors); Texts.Open(Errors, "Errors.Txt") END;
+
     Texts.OpenScanner(S, Errors, 0);
     REPEAT l := S.line; Texts.Scan(S)
     UNTIL (l # S.line) & (S.class = Texts.Int) & (S.i = n)  OR  S.eot;
@@ -442,34 +443,6 @@ MODULE OPM;  (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96  *)
       Texts.Read(S, c);
       WHILE ~S.eot & (c >= ' ') DO Out.Char(c); Texts.Read(S, c) END
     END
-
-
-(* ---
-VAR T: Texts.Text;  S: Texts.Scanner;
-
-PROCEDURE Write*(n: INTEGER);
-  VAR l: INTEGER;  c: CHAR;
-BEGIN
-  IF T = NIL THEN NEW(T); Texts.Open(T, "VishapOberonErrors.txt") END;
-  Texts.OpenScanner(S, T, 0);
-  REPEAT l := S.line; Texts.Scan(S)
-  UNTIL (l # S.line) & (S.class = Texts.Int) & (S.i = n)  OR  S.eot;
-  IF ~S.eot THEN Texts.Read(S, c);
-    WHILE ~S.eot & (c >= ' ') DO Console.Char(c); Texts.Read(S, c) END
-  END
-END Write;
-
-    (*NEW(T); Texts.Open(T, "vocErrors.Text"); Texts.OpenScanner(S, T, 0);
-    REPEAT S.line := 0;
-      REPEAT Texts.Scan(S) UNTIL S.eot OR (S.line # 0)
-    UNTIL S.eot OR (S.class = Texts.Int) & (S.i = n);
-    IF ~S.eot THEN Texts.Read(S, ch); i := 0;
-      WHILE ~S.eot & (ch # 0DX) DO buf[i] := ch; INC(i); Texts.Read(S, ch) END ;
-      buf[i] := 0X; LogWStr(buf);
-    END*)
-    LogWStr(errors.errors[n]);
-
---- *)
   END LogErrMsg;
 
 
diff --git a/src/tools/make/oberon.mk b/src/tools/make/oberon.mk
index 96e8fde0..ebbbe417 100644
--- a/src/tools/make/oberon.mk
+++ b/src/tools/make/oberon.mk
@@ -371,9 +371,8 @@ library:
 	@printf "\nCompiling lib$(ONAME)-O$(MODEL) sources\n"
 	rm -rf $(BUILDDIR)/$(MODEL)
 	mkdir -p $(BUILDDIR)/$(MODEL)
-	#cp src/runtime/*.[ch] $(BUILDDIR)/$(MODEL)
-	#cd $(BUILDDIR)/$(MODEL) && $(COMPILE) -c SYSTEM.c
 	cp $(BUILDDIR)/SYSTEM.[ho] $(BUILDDIR)/$(MODEL)
+	cp $(BUILDDIR)/WindowsWrapper.h $(BUILDDIR)/$(MODEL)
 	@make -f src/tools/make/oberon.mk -s O$(MODEL)library MODEL=$(MODEL)
 	@printf "\nMaking lib$(ONAME)-O$(MODEL) .a and .so\n"
 	ar rcs "$(BUILDDIR)/$(MODEL)/lib$(ONAME)-O$(MODEL).a" $(BUILDDIR)/$(MODEL)/*.o