OS_Develop/FreeDOS
OS_Develop/FreeDOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add back building boot files with extra defines but use explicitly specified values instead of generic NASMFLAGS so flags used for other assembly files does not effect building

Browse Source
This commit is contained in:
Kenneth J Davis 2023-12-18 17:25:15 -05:00
parent f666ac9804
commit 600192784b
No known key found for this signature in database
GPG Key ID: 59D5F216C38F11FD
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
boot/makefile
View File

@ -8,22 +8,22 @@
production: fat12com.bin fat16com.bin fat32chs.bin fat32lba.bin oemfat12.bin oemfat16.bin production: fat12com.bin fat16com.bin fat32chs.bin fat32lba.bin oemfat12.bin oemfat16.bin
fat12com.bin: boot.asm fat12com.bin: boot.asm
$(NASM) -dISFAT12 boot.asm -l$*.lst -ofat12com.bin $(NASM) -dISFAT12 $(NASMBOOTFLAGS) boot.asm -l$*.lst -ofat12com.bin
fat16com.bin: boot.asm fat16com.bin: boot.asm
$(NASM) -dISFAT16 boot.asm -l$*.lst -ofat16com.bin $(NASM) -dISFAT16 $(NASMBOOTFLAGS) boot.asm -l$*.lst -ofat16com.bin
fat32chs.bin: boot32.asm fat32chs.bin: boot32.asm
$(NASM) boot32.asm -l$*.lst -ofat32chs.bin $(NASM) $(NASMBOOTFLAGS) boot32.asm -l$*.lst -ofat32chs.bin
fat32lba.bin: boot32lb.asm fat32lba.bin: boot32lb.asm
$(NASM) boot32lb.asm -l$*.lst -ofat32lba.bin $(NASM) $(NASMBOOTFLAGS) boot32lb.asm -l$*.lst -ofat32lba.bin
oemfat12.bin: oemboot.asm oemfat12.bin: oemboot.asm
$(NASM) -dISFAT12 oemboot.asm -l$*.lst -ooemfat12.bin $(NASM) -dISFAT12 $(NASMBOOTFLAGS) oemboot.asm -l$*.lst -ooemfat12.bin
oemfat16.bin: oemboot.asm oemfat16.bin: oemboot.asm
$(NASM) -dISFAT16 oemboot.asm -l$*.lst -ooemfat16.bin $(NASM) -dISFAT16 $(NASMBOOTFLAGS) oemboot.asm -l$*.lst -ooemfat16.bin
clobber: clean clobber: clean
-$(RM) *.bin status.me -$(RM) *.bin status.me

2
build.bat
View File

@ -163,6 +163,8 @@ if "%1" == "" goto abort
if "%2" == "/V" goto :setDefineWithValue if "%2" == "/V" goto :setDefineWithValue
set ALLCFLAGS=%ALLCFLAGS% -D%1 set ALLCFLAGS=%ALLCFLAGS% -D%1
set NASMFLAGS=%NASMFLAGS% -D%1 set NASMFLAGS=%NASMFLAGS% -D%1
REM $(NASMBOOTFLAGS) are extra flags only used when building boot sectors
set NASMBOOTFLAGS=%NASMBOOTFLAGS% -d%1
goto nextOption goto nextOption
:setDefineWithValue :setDefineWithValue

1
default.bat
View File

@ -80,6 +80,7 @@ set BC5_BASE=
set MS_BASE= set MS_BASE=
set XNASM= set XNASM=
set NASMFLAGS= set NASMFLAGS=
set NASMBOOTFLAGS=
set XUPX= set XUPX=
set UPXOPT= set UPXOPT=
set LOADSEG= set LOADSEG=