Browse Source

Compile and link scripts fix for Linux

Arthur Yefimov 3 năm trước cách đây
mục cha
commit
9262e1f66a

+ 13 - 13
Programs/Gui.Mod

@@ -3,7 +3,7 @@ IMPORT Out, G := Graph;
 
 
 CONST
 CONST
   charW = 8; charH = 16;
   charW = 8; charH = 16;
-   
+
   (* redrawState *)
   (* redrawState *)
   redrawNone* = 0;
   redrawNone* = 0;
   redrawAll*  = 1;
   redrawAll*  = 1;
@@ -22,7 +22,7 @@ TYPE
   OnDrawHandler = PROCEDURE (c: Component; bmp: G.Bitmap; x0, y0: INTEGER);
   OnDrawHandler = PROCEDURE (c: Component; bmp: G.Bitmap; x0, y0: INTEGER);
   OnMouseDownHandler = PROCEDURE (c: Component; x, y, btn: INTEGER);
   OnMouseDownHandler = PROCEDURE (c: Component; x, y, btn: INTEGER);
   OnKeyDownHandler = PROCEDURE (c: Component; key: INTEGER);
   OnKeyDownHandler = PROCEDURE (c: Component; key: INTEGER);
-  
+
   MethodDesc* = RECORD
   MethodDesc* = RECORD
     draw*: OnDrawHandler;
     draw*: OnDrawHandler;
     mouseDown*: OnMouseDownHandler;
     mouseDown*: OnMouseDownHandler;
@@ -43,13 +43,13 @@ TYPE
     setOnKeyDown*: PROCEDURE (c: Component; hn: OnKeyDownHandler);
     setOnKeyDown*: PROCEDURE (c: Component; hn: OnKeyDownHandler);
   END;
   END;
   ComponentDesc* = RECORD
   ComponentDesc* = RECORD
-    x-, y-, w-, h-: INTEGER;
-    visible-: BOOLEAN;
-    redrawState-: INTEGER; (* see constants with prefix 'redraw' *)
+    x*, y*, w*, h*: INTEGER;
+    visible*: BOOLEAN;
+    redrawState*: INTEGER; (* see constants with prefix 'redraw' *)
     do*: Method;
     do*: Method;
-    onDraw-: OnDrawHandler;
-    onMouseDown-: OnMouseDownHandler;
-    onKeyDown-: OnKeyDownHandler;
+    onDraw*: OnDrawHandler;
+    onMouseDown*: OnMouseDownHandler;
+    onKeyDown*: OnKeyDownHandler;
     parent*: Component;
     parent*: Component;
     next*: Component
     next*: Component
   END;
   END;
@@ -60,17 +60,17 @@ TYPE
     bgColor*: INTEGER
     bgColor*: INTEGER
   END;
   END;
   ButtonDesc* = RECORD(ComponentDesc)
   ButtonDesc* = RECORD(ComponentDesc)
-    caption-: ARRAY 100 OF CHAR
+    caption*: ARRAY 100 OF CHAR
   END;
   END;
   EditDesc* = RECORD(ComponentDesc)
   EditDesc* = RECORD(ComponentDesc)
-    text-: ARRAY 4096 OF CHAR;
-    selStart-: INTEGER;
-    selLen-: INTEGER
+    text*: ARRAY 4096 OF CHAR;
+    selStart*: INTEGER;
+    selLen*: INTEGER
   END;
   END;
   CircleDesc* = RECORD(ComponentDesc)
   CircleDesc* = RECORD(ComponentDesc)
     color*: INTEGER
     color*: INTEGER
   END;
   END;
-  
+
 VAR
 VAR
   screen: G.Bitmap;
   screen: G.Bitmap;
   font: G.Font;
   font: G.Font;

+ 1 - 1
data/bin/compile.sh

@@ -8,7 +8,7 @@ cd bin
 
 
 OFRDIR="../data/bin/OfrontPlus/Target/Linux_amd64"
 OFRDIR="../data/bin/OfrontPlus/Target/Linux_amd64"
 PATH="$OFRDIR:$PATH"
 PATH="$OFRDIR:$PATH"
-export OBERON=".:$PWD/src:$OFRDIR/Lib/Sym"
+export OBERON=".:$PWD/../src:$OFRDIR/Lib/Sym"
 OFR="ofront+ -s -88 -7"
 OFR="ofront+ -s -88 -7"
 
 
 
 

+ 2 - 2
data/bin/link_console.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #!/bin/bash
 #   This script is run by Free Oberon on Linux. Current directory of the
 #   This script is run by Free Oberon on Linux. Current directory of the
-#   script will be where FreeOberon executable is located. This
+#   script will be in the bin directory. This
 #   particular script is for console programs.
 #   particular script is for console programs.
 
 
 THENAME="${1%.*}"
 THENAME="${1%.*}"
@@ -26,7 +26,7 @@ shift
 
 
 
 
 $CC -g3 -O0 -fno-exceptions \
 $CC -g3 -O0 -fno-exceptions \
-  -I ../../src \
+  -I ../src \
   -I $OFRDIR/../../Mod/Lib \
   -I $OFRDIR/../../Mod/Lib \
   -I $OFRDIR/Lib/Obj \
   -I $OFRDIR/Lib/Obj \
   $ONAME.c -o $ONAME \
   $ONAME.c -o $ONAME \

+ 2 - 2
data/bin/link_graph.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #!/bin/bash
 #   This script is run by Free Oberon on Linux. Current directory of the
 #   This script is run by Free Oberon on Linux. Current directory of the
-#   script will be where FreeOberon executable is located. This
+#   script will be in the bin directory. This
 #   particular script is for graphical programs.
 #   particular script is for graphical programs.
 
 
 cd bin
 cd bin
@@ -27,7 +27,7 @@ shift
 
 
 
 
 $CC -g3 -O0 -fno-exceptions \
 $CC -g3 -O0 -fno-exceptions \
-  -I ../../src \
+  -I ../src \
   -I $OFRDIR/../../Mod/Lib \
   -I $OFRDIR/../../Mod/Lib \
   -I $OFRDIR/Lib/Obj \
   -I $OFRDIR/Lib/Obj \
   $ONAME.c -o $ONAME \
   $ONAME.c -o $ONAME \