Changeset 185

Timestamp:

Nov 7, 2017, 7:12:51 AM (8 years ago)

Author:

Ben Rietbroek

Message:

Made non-EN language versions build again [v1.1.1-testing]

This was done by excuding the FX-module for non-EN builds.
Because the EN-build for REALEASE-v1.1.2 was already distributed with
ArcaOS v5, that is the only build with FX still included.

When FX is not compiled-in and Cooper Bars is enabled in the SETUP,
the TAB-key used for switching between MENU and PRE-BOOT screens will
not work.

Upcoming releases will completely remove FX related code and SETUP
options.

CAUTION:
This is a testbuild !
AirBoot uses the BIOS to access disks and a small coding error can trash
partition tables or other vital disk structures. You are advised to make
backups of TRACK0 and EBRs before using this testbuild. More info at:
​https://rousseaux.github.io/netlabs.air-boot/pdf/AirBoot-v1.1.0-manual.pdf

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• bootcode/Makefile (modified) (2 diffs)
• bootcode/airboot.asm (modified) (1 diff)

trunk/Makefile

@@ -128 +128 @@
         @echo ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
         @echo.
-
+        @echo ***** NOTE: Only the EN-build has the FX-module included !!    *****
+        @echo *****       To regain space, the FX-module will be completely  *****
+        @echo *****       excluded from future AiR-BOOT releases !           *****
+        @echo.
 
 

trunk/bootcode/Makefile

@@ -160 +160 @@
 # -Zd   = line number debug info
 # -Zi   = symbolic debug info
-ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM $(%JWASM_DEFINES) -q -W0 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
-ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM $(%JWASM_DEFINES) -q -W4 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
-ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM $(%JWASM_DEFINES) -q -WX -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
+ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -DBLD_LANG="'$(%BLD_LANG)'" $(%JWASM_DEFINES) -q -W0 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
+ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -DBLD_LANG="'$(%BLD_LANG)'" $(%JWASM_DEFINES) -q -W4 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
+ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -DBLD_LANG="'$(%BLD_LANG)'" $(%JWASM_DEFINES) -q -WX -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
 # Workaround for JWasm list-file generation.
 # Generate the list-file on a local drive so JWasm doen't take forever.
@@ -298 +298 @@
 # Default to development language is none defined.
 !if "$(%BLD_LANG)"==""
-%BLD_LANG=DEV_BLD_LANG
+#~ %BLD_LANG=DEV_BLD_LANG
 !endif
 # Generate include-files for specified language.

trunk/bootcode/airboot.asm

@@ -83 +83 @@
 ;~ AUX_DEBUG       EQU
 
-;
-; To have FX enabled, make sure FX_ENABLE is defined.
-; There is no need (for now) to remove Cooper Bars from the setup-menu
-; because AiR-BOOT does not crash when enabling Cooper Bars while FX
-; is not compiled in. Only TAB to post-screen does not work.
-; Way to go Martin !
-;
+
+;
+; The FX (video animation) module is about to be completely removed from the
+; build to regain code space. This is especially true for non-EN builds,
+; which often have longer strings or even load special character sets.
+;
+; However, because the EN-build for REALEASE-v1.1.2 was already distributed
+; with ArcaOS v5, FX will only be excluded for non-EN builds. When FX is not
+; compiled-in and Cooper Bars is enabled in the SETUP, the TAB-key used for
+; switching between MENU and PRE-BOOT screens will not work.
+;
+; Upcoming releases will completely remove FX related code and SETUP options.
+;
+; As can be read in 'special/fx.asm' around line 26, this removal may have
+; severe consequences for me, so if no new AiR-BOOT releases appear, then you
+; know I have been './'-ted, which most probably will be something completely
+; different from being 'slash-dotted' ... ;)
+;
+IF  BLD_LANG EQ 'en'
 IFNDEF  AUX_DEBUG
 FX_ENABLED      EQU
 ENDIF
-
+ELSE
+    echo
+    echo ***** NOTE: Excluding FX-module for this language ! *****
+    echo
+ENDIF