Browse Source

Make scripts updated

Arthur Yefimov 3 years ago
parent
commit
ab7d2fa773
2 changed files with 29 additions and 8 deletions
  1. 27 6
      src/make.bat
  2. 2 2
      src/make.sh

+ 27 - 6
src/make.bat

@@ -14,13 +14,25 @@ SET CCFULL=%CC% -g3 -O0 -fno-exceptions -I %OFRDIR%\..\..\Mod\Lib -I %OFRDIR%\Li
 ECHO ON
 %OFR% -C Config_win32.Mod
 @IF ERRORLEVEL 1 GOTO ERR
+%OFR% -C Utf8.Mod
+@IF ERRORLEVEL 1 GOTO ERR
+%OFR% -C Strings.Mod
+@IF ERRORLEVEL 1 GOTO ERR
+%OFR% -C Reals.Mod
+@IF ERRORLEVEL 1 GOTO ERR
 %OFR% -C Int.Mod
 @IF ERRORLEVEL 1 GOTO ERR
-%OFR% -7 StrList.Mod
+%OFR% -C In.Mod
+@IF ERRORLEVEL 1 GOTO ERR
+%OFR% -C Out.Mod
+@IF ERRORLEVEL 1 GOTO ERR
+%OFR% -C Files.Mod
+@IF ERRORLEVEL 1 GOTO ERR
+%OFR% -7w StrList.Mod
 @IF ERRORLEVEL 1 GOTO ERR
-%OFR% -7 Dir.Mod
+%OFR% -7w Dir.Mod
 @IF ERRORLEVEL 1 GOTO ERR
-%OFR% -C -i SDL2.Mod
+%OFR% -Ci SDL2.Mod
 @IF ERRORLEVEL 1 GOTO ERR
 %OFR% -C Graph.Mod
 @IF ERRORLEVEL 1 GOTO ERR
@@ -34,19 +46,28 @@ ECHO ON
 @IF ERRORLEVEL 1 GOTO ERR
 %OFR% -C Editor.Mod
 @IF ERRORLEVEL 1 GOTO ERR
-%OFR% -C -m FreeOberon.Mod
+%OFR% -Cm FreeOberon.Mod
 @IF ERRORLEVEL 1 GOTO ERR
 windres resources.rc resources.o
 @REM                        -O0 change to -Os (?)   add -s (?)
+%CCFULL% -c Utf8.c
+%CCFULL% -c Strings.c
+%CCFULL% -c Reals.c
 %CCFULL% -c Int.c
+%CCFULL% -c In.c
+%CCFULL% -c Out.c
+%CCFULL% -c Files.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 StrList.o Dir.o SDL2.o Graph.o
+%AR% -crs ..\data\bin\FreeOberon.a ^
+  Utf8.o Strings.o Reals.o Int.o In.o Out.o Files.o ^
+  StrList.o Dir.o SDL2.o Graph.o
 
 %CCFULL% Config.c term\term_win32.c ^
-  Int.o StrList.o Dir.o SDL2.o Graph.o ^
+  Utf8.o Strings.o Reals.o Int.o In.o Out.o Files.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 ^
   %OFRDIR%\Lib\Ofront.a ^

+ 2 - 2
src/make.sh

@@ -32,7 +32,7 @@ $OFR -7w StrList.Mod
 
 $OFR -7w Dir.Mod
 
-$OFR -C -i SDL2.Mod
+$OFR -Ci SDL2.Mod
 
 $OFR -C Graph.Mod
 
@@ -46,7 +46,7 @@ $OFR -C EditorText.Mod
 
 $OFR -C Editor.Mod
 
-$OFR -C -m FreeOberon.Mod
+$OFR -Cm FreeOberon.Mod