Browse Source

Linux make.sh update

Arthur Yefimov 4 years ago
parent
commit
0036398084
2 changed files with 15 additions and 7 deletions
  1. 2 0
      .gitignore
  2. 13 7
      src/make.sh

+ 2 - 0
.gitignore

@@ -9,6 +9,8 @@
 /src/*.c
 /src/*.sym
 /src/term/*.o
+/data/bin/libFreeOberon.a
+/data/bin/FreeOberon.a
 /data/bin/voc/C
 /data/bin/voc/bin
 /data/bin/voc/lib

+ 13 - 7
src/make.sh

@@ -2,7 +2,10 @@ PROG="FreeOberon"
 OFRDIR="$OBPATH"
 SDL2Opts="-lSDL2"
 OFR="ofront+ -88 -C -s"
-export OBERON=.:$OBPATH/Lib/Sym:$OBPATH/Sym
+export OBERON=.:$OFRDIR/Lib/Sym
+CC="gcc"
+AR="ar"
+CCFULL="$CC -g3 -O0 -fno-exceptions -I $OFRDIR/../../Mod/Lib -I $OFRDIR/Lib/Obj"
 
 $OFR Config_linux.Mod
 $OFR Int.Mod
@@ -15,9 +18,12 @@ $OFR EditorText.Mod
 $OFR Editor.Mod
 $OFR -m FreeOberon.Mod
 
-#                          -O0 change to -Os (?)   add -s (?)
-gcc -g3 -O0 -fno-exceptions -I $OFRDIR/../../Mod/Lib \
-  -I $OFRDIR/Lib/Obj Config.c term/term_linux.c \
-  Int.c SDL2.c Graph.c Term.c Terminal.c OV.c EditorText.c \
-  Editor.c $PROG.c -o ../$PROG \
-  $OFRDIR/Lib/libOfront.a $SDL2Opts -lSDL2_image
+$CCFULL -c Int.c
+$CCFULL -c SDL2.c
+$CCFULL -c Graph.c
+$AR -crs ../data/bin/libFreeOberon.a Int.o SDL2.o Graph.o
+
+$CCFULL Config.c term/term_linux.c Int.o SDL2.o Graph.o \
+  Term.c Terminal.c OV.c EditorText.c Editor.c $PROG.c \
+  -o ../$PROG $OFRDIR/Lib/libOfront.a \
+  $SDL2Opts -lSDL2_image