vishapoberon/compiler
1
0
Fork 0
mirror of https://github.com/vishapoberon/compiler.git synced 2026-04-06 00:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix mingw build.

Browse source
This commit is contained in:
David Brown 2016-11-14 21:25:04 +00:00
parent 377bc73774
commit f9c72a37b0
2 changed files with 2 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/compiler/OPM.Mod
View file

@ -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;

3
src/tools/make/oberon.mk
View file

@ -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