浏览代码

Windows: compilation fix

Arthur Yefimov 3 年之前
父节点
当前提交
85d3296752
共有 4 个文件被更改,包括 12 次插入8 次删除
  1. 2 2
      Data/bin/compile.bat
  2. 3 2
      Data/bin/link_console.bat
  3. 2 2
      Data/bin/link_graph.bat
  4. 5 2
      src/FreeOberon.Mod

+ 2 - 2
Data/bin/compile.bat

@@ -6,8 +6,8 @@ REM You are free to edit this file to adjust the process.
 
 CD bin >nul 2>&1
 SET CURDIR=%~dp0
-SET OFRDIR=%CURDIR%OfrontPlus\Target\Win64
-SET PATH=%OFRDIR%;%CURDIR%mingw32\bin;%PATH%
+SET OFRDIR=%CURDIR%OfrontPlus\Target\Win32
+SET PATH=%OFRDIR%;%PATH%
 SET OBERON=.;%CURDIR%..\..\src;%OFRDIR%\Lib\Sym
 SET OFR=ofront+ -s -88 -7w
 

+ 3 - 2
Data/bin/link_console.bat

@@ -7,8 +7,9 @@ CD bin >nul 2>&1
 @DEL /s %~n1.exe >nul 2>&1
 SET CURDIR=%~dp0
 SET ONAME=%~n1
-SET OFRDIR=%CURDIR%OfrontPlus\Target\Win64
-SET PATH=%OFRDIR%;%CURDIR%mingw64\bin;%PATH%
+SET OFRDIR=%CURDIR%OfrontPlus\Target\Win32
+SET PATH=%OFRDIR%;%CURDIR%mingw32\bin;%PATH%
+ECHO %OFRDIR%;%CURDIR%mingw32\bin;%%PATH
 SET CC=gcc
 
 REM Put all arguments starting from 2nd to ARGS.

+ 2 - 2
Data/bin/link_graph.bat

@@ -7,8 +7,8 @@ CD bin >nul 2>&1
 @DEL /s %~n1.exe >nul 2>&1
 SET CURDIR=%~dp0
 SET ONAME=%~n1
-SET OFRDIR=%CURDIR%OfrontPlus\Target\Win64
-SET PATH=%OFRDIR%;%CURDIR%mingw64\bin;%PATH%
+SET OFRDIR=%CURDIR%OfrontPlus\Target\Win32
+SET PATH=%OFRDIR%;%CURDIR%mingw32\bin;%PATH%
 SET CC=gcc
 REM SET SDL2Opts=-w -Wl,-subsystem,windows -lmingw32 -lSDL2main -lSDL2
 SET SDL2Opts=-lmingw32 -lSDL2main -lSDL2

+ 5 - 2
src/FreeOberon.Mod

@@ -91,6 +91,9 @@ PROCEDURE ShowErrors(s: ARRAY OF CHAR);
 VAR lines, width, x0, x, y, i: INTEGER;
 BEGIN
   ;;;;;;Out.String('ERRORS:'); Out.Ln;;;;;;
+  OV.SetStatusText(app, s);
+  (*T.Print(0, 1, s, 14, 12);
+  T.Flush;*)
   ;;;;;;Out.String(s); Out.Ln;;;;;;
   ;;;;;;Out.String('END ERRORS.'); Out.Ln;;;;;;
 (*
@@ -252,7 +255,7 @@ PROCEDURE Write(ch: CHAR);
 VAR tW, tH: INTEGER;
 BEGIN
   IF ch = 0AX THEN Ln
-  ELSE
+  ELSIF ~Config.isWindows OR (ch # 0DX) THEN
     T.SetCell(curX, curY, ch, curFg, curBg);
     T.Size(tW, tH);
     IF curX >= tW - 1 THEN
@@ -309,7 +312,7 @@ BEGIN fname[0] := 0X; line := 1; col := 1;
         INC(i, 4); ReadInt(s, i, error)
       ELSE error := 0
       END;
-      s := 'Пропущена точка с запятой';;;;;;;
+      (*s := 'Пропущена точка с запятой';;;;;;;*)
       ;;;;;Out.String('error = ');Out.Int(error, 0);Out.Ln;;;;;;
     END
   END