2
0
Arthur Yefimov 4 жил өмнө
parent
commit
7fd64663c5
2 өөрчлөгдсөн 43 нэмэгдсэн , 22 устгасан
  1. 2 6
      src/make.bat
  2. 41 16
      src/make.sh

+ 2 - 6
src/make.bat

@@ -3,10 +3,10 @@ SET PROG=FreeOberon
 SET OFRDIR=C:\prg\OfrontPlus\Target\Win64
 SET GCCDIR=C:\prg\mingw-w64\mingw64\bin
 SET PATH=%GCCDIR%;%OFRDIR%;%PATH%
+SET OBERON=.;%OFRDIR%\Lib\Sym
 REM SET SDL2Opts=-w -Wl,-subsystem,windows -lmingw32 -lSDL2main -lSDL2
 SET SDL2Opts=-lmingw32 -lSDL2main -lSDL2
 SET OFR=ofront+ -s -88
-SET OBERON=.;%OFRDIR%\Lib\Sym
 SET CC=gcc
 SET AR=ar
 SET CCFULL=%CC% -g3 -O0 -fno-exceptions -I %OFRDIR%\..\..\Mod\Lib -I %OFRDIR%\Lib\Obj
@@ -36,11 +36,8 @@ ECHO ON
 @IF ERRORLEVEL 1 GOTO ERR
 %OFR% -C -m FreeOberon.Mod
 @IF ERRORLEVEL 1 GOTO ERR
-
 windres resources.rc resources.o
-
 @REM                        -O0 change to -Os (?)   add -s (?)
-
 %CCFULL% -c Int.c
 %CCFULL% -c StrList.c
 %CCFULL% -c Dir.c
@@ -51,8 +48,7 @@ windres resources.rc resources.o
 %CCFULL% Config.c term\term_win32.c ^
   Int.o StrList.o Dir.o SDL2.o Graph.o ^
   Term.c Terminal.c OV.c EditorText.c Editor.c ^
-  %PROG%.c -o ..\%PROG%.exe ^
-  resources.o ^
+  %PROG%.c -o ..\%PROG%.exe resources.o ^
   %OFRDIR%\Lib\Ofront.a ^
   %SDL2Opts% -lSDL2_image
 

+ 41 - 16
src/make.sh

@@ -1,29 +1,54 @@
+#/bin/bash
 PROG="FreeOberon"
 OFRDIR="$OBPATH"
-SDL2Opts="-lSDL2"
-OFR="ofront+ -88 -C -s"
+
+export PATH=$OBPATH:$PATH
 export OBERON=.:$OFRDIR/Lib/Sym
+
+SDL2Opts="-lSDL2"
+OFR="ofront+ -s -88"
 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
-$OFR -i SDL2.Mod
-$OFR Graph.Mod
-$OFR Terminal.Mod
-$OFR Term.Mod
-$OFR OV.Mod
-$OFR EditorText.Mod
-$OFR Editor.Mod
-$OFR -m FreeOberon.Mod
+
+$OFR -C Config_linux.Mod
+
+$OFR -C Int.Mod
+
+$OFR -7 StrList.Mod
+
+$OFR -7 Dir.Mod
+
+$OFR -C -i SDL2.Mod
+
+$OFR -C Graph.Mod
+
+$OFR -C Terminal.Mod
+
+$OFR -C Term.Mod
+
+$OFR -C OV.Mod
+
+$OFR -C EditorText.Mod
+
+$OFR -C Editor.Mod
+
+$OFR -C -m FreeOberon.Mod
+
+
 
 $CCFULL -c Int.c
+$CCFULL -c StrList.c
+$CCFULL -c Dir.c
 $CCFULL -c SDL2.c
 $CCFULL -c Graph.c
-$AR -crs ../data/bin/libFreeOberon.a Int.o SDL2.o Graph.o
+$AR -crs ../data/bin/libFreeOberon.a Int.o StrList.o Dir.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 \
+$CCFULL Config.c term/term_linux.c \
+  Int.o StrList.o Dir.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
+