Index: trunk/bootcode/Makefile
===================================================================
--- trunk/bootcode/Makefile	(revision 180)
+++ trunk/bootcode/Makefile	(revision 182)
@@ -160,7 +160,7 @@
 # -Zd   = line number debug info
 # -Zi   = symbolic debug info
-ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -q -W0 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
-ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -q -W4 -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
-ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DJWASM -q -WX -Cp -zcw -Fo$^. -Sa $(JWASM_LIST_FILE) -Fw$^&.err
+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
 # Workaround for JWasm list-file generation.
 # Generate the list-file on a local drive so JWasm doen't take forever.
@@ -211,14 +211,14 @@
 # 16-bits C Compiler.
 CC16=wcc
-CC16_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -w4 -e25 -zq -od -fo=$^.
-CC16_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -d2 -w4 -e25 -zq -od -fo=$^.
-CC16_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -d2 -w4 -e25 -zq -od -fo=$^.
+CC16_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(%CC_DEFINES) -w4 -e25 -zq -od -fo=$^.
+CC16_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(%CC_DEFINES) -d2 -w4 -e25 -zq -od -fo=$^.
+CC16_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(%CC_DEFINES) -d2 -w4 -e25 -zq -od -fo=$^.
 CC16_FLAGS=$(CC16_FLAGS_D$(DEBUG_LEVEL))
 
 # 32-bits C Compiler.
 CC32=wcc386
-CC32_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -w4 -e25 -zq -od -6r -mf -fo=$^.
-CC32_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -d2 -w4 -e25 -zq -od -6r -mf -fo=$^.
-CC32_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -d2 -w4 -e25 -zq -od -6r -mf -fo=$^.
+CC32_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(%CC_DEFINES) -w4 -e25 -zq -od -6r -mf -fo=$^.
+CC32_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(%CC_DEFINES) -d2 -w4 -e25 -zq -od -6r -mf -fo=$^.
+CC32_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(%CC_DEFINES) -d2 -w4 -e25 -zq -od -6r -mf -fo=$^.
 CC32_FLAGS=$(CC32_FLAGS_D$(DEBUG_LEVEL))
 
Index: trunk/bootcode/airboot.md5
===================================================================
--- trunk/bootcode/airboot.md5	(revision 180)
+++ trunk/bootcode/airboot.md5	(revision 182)
@@ -1,1 +1,1 @@
-3fbd042146daf016accd81b36e5e6560  airboot.bin
+7611b247c861439e5e1819e403099ccf  airboot.bin
Index: trunk/bootcode/bldlevel.inc
===================================================================
--- trunk/bootcode/bldlevel.inc	(revision 180)
+++ trunk/bootcode/bldlevel.inc	(revision 182)
@@ -40,8 +40,14 @@
 ;
 
-; Vendor
-;~ BLDLVL_VENDOR           TEXTEQU <'KIEWITZ'>
-;~ BLDLVL_VENDOR           TEXTEQU <'RDPe'>
-BLDLVL_VENDOR           TEXTEQU <'*UNKNOWN*'>
+; Vendor supplying this build -- make BLDLVL_VENDOR=YourInitials
+IFNDEF  BLDLVL_VENDOR
+BLDLVL_VENDOR           EQU     '*UNKNOWN*'
+ENDIF
+
+; Build machine -- make BLDLVL_MACHINE=YourMachine
+IFNDEF  BLDLVL_MACHINE
+BLDLVL_MACHINE          EQU     '*UNKNOWN*'    ; 16 chars max.
+ENDIF
+
 ; Version
 BLDLVL_MAJOR_VERSION    EQU     AB_MAJOR_VERSION    + '0'
@@ -56,7 +62,5 @@
 BLDLVL_MINUTES          EQU     (AB_MINUTES SHR 4)+'0',(AB_MINUTES AND 0Fh)+'0'
 BLDLVL_SECONDS          EQU     (AB_SECONDS SHR 4)+'0',(AB_SECONDS AND 0Fh)+'0'
-; Build machine
-;~ BLDLVL_MACHINE          EQU     'OS2BLDBOX'    ; 16 chars max.
-BLDLVL_MACHINE          EQU     '*UNKNOWN*'    ; 16 chars max.
+
 ; Build language
 IFDEF   WASM
Index: trunk/bootcode/fc.mnu
===================================================================
--- trunk/bootcode/fc.mnu	(revision 180)
+++ trunk/bootcode/fc.mnu	(revision 182)
@@ -4,4 +4,6 @@
 
 B:	Build Development Version [EN]
+	cmd /c "set BLDLVL_VENDOR=& set BLDLVL_MACHINE=& wmake -h dev"
+V:	Build Vendor Dev  Version [EN]
 	wmake -h dev
 M:	Build Development Version [??]
