Changeset 60 for trunk/tools/internal


Ignore:
Timestamp:
Feb 18, 2016, 5:18:51 PM (10 years ago)
Author:
Ben Rietbroek
Message:

Fixed building on Linux [v1.1.1-testing]

Of course the lowercasing broke building on Linux.
This commit fixes that.

Location:
trunk/tools/internal
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/tools/internal/GNUmakefile

    r37 r60  
    66# Include the forwarder.
    77#
    8 include         ../../INCLUDE/MAKEFRWD.MIF
     8include         ../../include/makefrwd.mif

  • trunk/tools/internal/Makefile

    r55 r60  
    11###############################################################################
    2 # Makefile :: Builds FIXCODE program for several platforms.           [wmake] #
    3 ###############################################################################
    4 
    5 #
    6 # This Makefile builds the FIXCODE program for DOS, Windows, OS/2 and Linux.
    7 # FIXCODE is used to embed the anti-virus code into the AiR-BOOT image.
     2# Makefile :: Builds 'fixcode' program for several platforms.         [wmake] #
     3###############################################################################
     4
     5#
     6# This Makefile builds the 'fixcode' program for DOS, Windows, OS/2 and Linux.
     7# It is used to embed the anti-virus code into the AiR-BOOT image.
    88# This anti-virus code protects the MBR and is installed as a TSR by the
    99# loader. That's why it cannot be included at the source level.
    … …  
    1414# This is used to compensate for the differences between the target platforms.
    1515#
    16 !include        ../../INCLUDE/MAKEFILE.MIF
     16!include        ../../include/makefile.mif
    1717
    1818
    … …  
    4646# The DOS COM-version has no suffix.
    4747#
    48 BASENAME=FIXCODE
     48BASENAME=fixcode
    4949
    5050#
    5151# This is a list of the Targets to be built.
    5252#
    53 #TARGETS=$(BASENAME)D.EXE
    54 #TARGETS=$(BASENAME).COM
    55 #TARGETS=$(BASENAME).COM $(BASENAME)D.EXE $(BASENAME)W.EXE $(BASENAME)2.EXE $(BASENAME)L.ELF
    56 TARGETS=$(BASENAME)D.EXE $(BASENAME)W.EXE $(BASENAME)2.EXE $(BASENAME)L.ELF
     53#TARGETS=$(BASENAME)d.exe
     54#TARGETS=$(BASENAME).com
     55#TARGETS=$(BASENAME).com $(BASENAME)d.exe $(BASENAME)w.exe $(BASENAME)2.exe $(BASENAME)l.elf
     56TARGETS=$(BASENAME)d.exe $(BASENAME)w.exe $(BASENAME)2.exe $(BASENAME)l.elf
    5757
    5858#
    … …  
    7878# -Cp   = case sensitive symbols
    7979# -zcw  = no _ prefix on symbols (C model)
    80 ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Fo$^. -Fl=$^&.LST -Fw$^&.ERR
    81 ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Zd -Zi -Fo$^. -Sa -Fl=$^&.LST -Fw$^&.ERR
    82 ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Zd -Zi -Fo$^. -Sa -Fl=$^&.LST -Fw$^&.ERR
     80ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Fo$^. -Fl=$^&.lst -Fw$^&.err
     81ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Zd -Zi -Fo$^. -Sa -Fl=$^&.lst -Fw$^&.err
     82ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Zd -Zi -Fo$^. -Sa -Fl=$^&.lst -Fw$^&.err
    8383!elseif "$(ASM)"=="wasm"
    84 ASM_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -fo=$^. -fr=$^&.ERR
    85 ASM_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -d1 -fo=$^. -fr=$^&.ERR
    86 ASM_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -d1 -fo=$^. -fr=$^&.ERR
     84ASM_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -fo=$^. -fr=$^&.err
     85ASM_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -d1 -fo=$^. -fr=$^&.err
     86ASM_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -d1 -fo=$^. -fr=$^&.err
    8787!elseif "$(ASM)"=="tasm"
    8888# -ml   = case sensitive symbols
    … …  
    9191ASM_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -t -z -zi -c -la
    9292!elseif "$(ASM)"=="alp"
    93 ASM_FLAGS_D0=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Feo:OBJ +Fl +Fel:LST +Fm +Fem:ERR
    94 ASM_FLAGS_D1=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Od:MS16 +Feo:OBJ +Fl +Fel:LST +Fm +Fem:ERR
     93ASM_FLAGS_D0=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Feo:obj +Fl +Fel:lst +Fm +Fem:err
     94ASM_FLAGS_D1=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Od:MS16 +Feo:obj +Fl +Fel:lst +Fm +Fem:err
    9595ASM_FLAGS_D2=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP
    9696!else
    … …  
    104104CC16=wcc
    105105MM16=-ml
    106 CC16_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM16) -w4 -e25 -zq -otexan -fo=$^. -fr=$^&.ERR
    107 CC16_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM16) -d2 -w4 -e25 -zq -od -fo=$^. -fr=$^&.ERR
    108 CC16_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM16) -d2 -w4 -e25 -zq -od -fo=$^. -fr=$^&.ERR
     106CC16_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM16) -w4 -e25 -zq -otexan -fo=$^. -fr=$^&.err
     107CC16_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM16) -d2 -w4 -e25 -zq -od -fo=$^. -fr=$^&.err
     108CC16_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM16) -d2 -w4 -e25 -zq -od -fo=$^. -fr=$^&.err
    109109CC16_FLAGS=$(CC16_FLAGS_D$(DEBUG_LEVEL))
    110110
    … …  
    114114MM32=-mf
    115115CC32=wcc386
    116 CC32_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -w4 -e25 -zq -otexan -6r -fo=$^. -fr=$^&.ERR
    117 CC32_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -d2 -w4 -e25 -zq -od -6r -fo=$^. -fr=$^&.ERR
    118 CC32_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -d2 -w4 -e25 -zq -od -6r -fo=$^. -fr=$^&.ERR
     116CC32_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -w4 -e25 -zq -otexan -6r -fo=$^. -fr=$^&.err
     117CC32_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -d2 -w4 -e25 -zq -od -6r -fo=$^. -fr=$^&.err
     118CC32_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -d2 -w4 -e25 -zq -od -6r -fo=$^. -fr=$^&.err
    119119CC32_FLAGS_R=-w4 -e25 -zq -od -6r -mf -fo=$^.
    120120CC32_FLAGS=$(CC32_FLAGS_D$(DEBUG_LEVEL))
    … …  
    124124#
    125125LNK=wlink
    126 LNK_FLAGS_D0=op q op v op map=$^&.MAP
    127 LNK_FLAGS_D1=op q op v d all op map=$^&.MAP
    128 LNK_FLAGS_D2=op q op v d all op map=$^&.MAP
     126LNK_FLAGS_D0=op q op v op map=$^&.map
     127LNK_FLAGS_D1=op q op v d all op map=$^&.map
     128LNK_FLAGS_D2=op q op v d all op map=$^&.map
    129129LNK_FLAGS=$(LNK_FLAGS_D$(DEBUG_LEVEL))
    130130
    … …  
    175175        @echo.
    176176        @echo =====================================================================
    177         @echo = PROGRAM: FIXCODE Multi Platform      [DOS, Win32, OS/2 and Linux] =
     177        @echo = PROGRAM: 'fixcode' Multi Platform    [DOS, Win32, OS/2 and Linux] =
    178178        @echo =====================================================================
    179179#       @echo.
    … …  
    222222# DOS 16-bits (COM)
    223223###############################################################################
    224 $(BASENAME).COM:        $(BASENAME).OBJ
    225         $(LNK) $(LNK_FLAGS) file $^&.OBJ name $^. sys dos com
    226         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    227         @echo.
    228 
    229 $(BASENAME).OBJ:        $(BASENAME).ASM
    230 #       @echo.
    231         @echo TARGET: $^&.COM   [DOS 16-bits COM-file]
    232         $(ASM) $(ASM_FLAGS) $(BASENAME).ASM
    233         @wdis -fi $^. > $^&.WDA
     224$(BASENAME).com:        $(BASENAME).obj
     225        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys dos com
     226        @if exist $^. @echo             $^. $(MSG_SUCCESS)
     227        @echo.
     228
     229$(BASENAME).obj:        $(BASENAME).asm
     230#       @echo.
     231        @echo TARGET: $^&.com   [DOS 16-bits COM-file]
     232        $(ASM) $(ASM_FLAGS) $(BASENAME).asm
     233        @wdis -fi $^. > $^&.wda
    234234
    235235
    … …  
    237237# DOS 16-bits (MZ)
    238238###############################################################################
    239 $(BASENAME)D.EXE:       $(BASENAME)D.OBJ
    240         $(LNK) $(LNK_FLAGS) file $^&.OBJ name $^. sys dos
    241         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    242         @echo.
    243 
    244 $(BASENAME)D.OBJ:       $(BASENAME).C $(BASENAME).H
    245 #       @echo.
    246         @echo TARGET: $^&.EXE   [DOS 16-bits Executable]
    247         $(CC16) $(CC16_FLAGS) -bt=dos $(BASENAME).C
    248         @wdis -fi $^. > $^&.WDA
     239$(BASENAME)d.exe:       $(BASENAME)d.obj
     240        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys dos
     241        @if exist $^. @echo             $^. $(MSG_SUCCESS)
     242        @echo.
     243
     244$(BASENAME)d.obj:       $(BASENAME).c $(BASENAME).h
     245#       @echo.
     246        @echo TARGET: $^&.exe   [DOS 16-bits Executable]
     247        $(CC16) $(CC16_FLAGS) -bt=dos $(BASENAME).c
     248        @wdis -fi $^. > $^&.wda
    249249
    250250
    … …  
    252252# NT 32-bits (PE)
    253253###############################################################################
    254 $(BASENAME)W.EXE:       $(BASENAME)W.OBJ
    255         $(LNK) $(LNK_FLAGS) file $^&.OBJ name $^. sys nt
    256         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    257         @echo.
    258 
    259 $(BASENAME)W.OBJ:       $(BASENAME).C $(BASENAME).H
    260 #       @echo.
    261         @echo TARGET: $^&.EXE   [NT 32-bits Executable]
    262         $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)nt -bt=nt $(BASENAME).C
    263         @wdis -fi $^. > $^&.WDA
     254$(BASENAME)w.exe:       $(BASENAME)w.obj
     255        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys nt
     256        @if exist $^. @echo             $^. $(MSG_SUCCESS)
     257        @echo.
     258
     259$(BASENAME)w.obj:       $(BASENAME).c $(BASENAME).h
     260#       @echo.
     261        @echo TARGET: $^&.exe   [NT 32-bits Executable]
     262        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)nt -bt=nt $(BASENAME).c
     263        @wdis -fi $^. > $^&.wda
    264264
    265265
    … …  
    267267# OS/2 32-bits (LX)
    268268###############################################################################
    269 $(BASENAME)2.EXE:       $(BASENAME)2.OBJ
    270         $(LNK) $(LNK_FLAGS) file $^&.OBJ name $^. sys os2v2
    271         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    272         @echo.
    273 
    274 $(BASENAME)2.OBJ:       $(BASENAME).C $(BASENAME).H
    275 #       @echo.
    276         @echo TARGET: $^&.EXE   [OS/2 32-bits Executable]
    277         $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=os2 $(BASENAME).C
    278         @wdis -fi $^. > $^&.WDA
     269$(BASENAME)2.exe:       $(BASENAME)2.obj
     270        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys os2v2
     271        @if exist $^. @echo             $^. $(MSG_SUCCESS)
     272        @echo.
     273
     274$(BASENAME)2.obj:       $(BASENAME).c $(BASENAME).h
     275#       @echo.
     276        @echo TARGET: $^&.exe   [OS/2 32-bits Executable]
     277        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=os2 $(BASENAME).c
     278        @wdis -fi $^. > $^&.wda
    279279
    280280
    … …  
    282282# Linux 32-bits (ELF)
    283283###############################################################################
    284 $(BASENAME)L.ELF:       $(BASENAME)L.OBJ
    285         $(LNK) $(LNK_FLAGS) file $^&.OBJ name $^&.ELF sys linux
    286 #       $(MV) $^&.ELF $^.
    287         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    288         @echo.
    289 
    290 $(BASENAME)L.OBJ:       $(BASENAME).C $(BASENAME).H
    291 #       @echo.
    292         @echo TARGET: $^&.ELF   [Linux 32-bits Executable]
    293         $(CC32) $(CC32_FLAGS) -bt=linux $(BASENAME).C
    294         @wdis -fi $^. > $^&.WDA
     284$(BASENAME)l.elf:       $(BASENAME)l.obj
     285        $(LNK) $(LNK_FLAGS) file $^&.obj name $^&.elf sys linux
     286#       $(MV) $^&.elf $^.
     287        @if exist $^. @echo             $^. $(MSG_SUCCESS)
     288        @echo.
     289
     290$(BASENAME)l.obj:       $(BASENAME).c $(BASENAME).h
     291#       @echo.
     292        @echo TARGET: $^&.elf   [Linux 32-bits Executable]
     293        $(CC32) $(CC32_FLAGS) -bt=linux $(BASENAME).c
     294        @wdis -fi $^. > $^&.wda
    295295
    296296
    … …  
    315315clean:  .SYMBOLIC
    316316        @for %%i in ($(TARGETS)) do @if exist %%i $(RM) %%i
    317         @if exist *.OBJ $(RM) *.OBJ
    318         @if exist *.WDA $(RM) *.WDA
    319         @if exist *.NDA $(RM) *.NDA
    320         @if exist *.MAP $(RM) *.MAP
    321         @if exist *.LST $(RM) *.LST
    322         @if exist *.ERR $(RM) *.ERR
     317        @if exist *.obj $(RM) *.obj
     318        @if exist *.wda $(RM) *.wda
     319        @if exist *.nda $(RM) *.nda
     320        @if exist *.map $(RM) *.map
     321        @if exist *.lst $(RM) *.lst
     322        @if exist *.err $(RM) *.err
    323323        @if exist *.o   $(RM) *.o
    324324

  • trunk/tools/internal/fixcode.c

    r57 r60  
    1919/*
    2020// FIXCODE.C -- Fix the AiR-BOOT image; include the code-size and MBR prot-img.
    21 //  This reads AIR-BOOT.COM, merges MBR-PROT.BIN and writes AIRBOOT.BIN.
     21//  This reads 'air-boot.com', merges 'mbr-prot.bin' and writes 'airboot.bin'.
    2222//  It is a quick-and-dirty translation of the original DOS-only ASM file.
    2323//  Of course it's not as small but it's much easier to maintain across
    2424//  multiple platforms. A small change with regard to the old ASM version is
    25 //  that it directly writes AIRBOOT.BIN instead of writing AIR-BOOT.COM.
     25//  that it directly writes 'airboot.bin' instead of writing 'air-boot.com'.
    2626//  This way the pre and post situations are kept valid.
    2727*/
    2828
    2929
    30 #include    "FIXCODE.H"
     30#include    "fixcode.h"
    3131
    3232
    … …  
    4949
    5050/* File names */
    51 #define     IN_FILE     "AIR-BOOT.COM"              // Target from assembly.
     51#define     IN_FILE     "air-boot.com"              // Target from assembly.
    5252#ifdef      PLATFORM_LINUX
    53 #define     MERGE_FILE  "MBR-PROT/MBR-PROT.BIN"     // MBR Protection Image.
     53#define     MERGE_FILE  "mbr-prot/mbr-prot.bin"     // MBR Protection Image.
    5454#else
    55 #define     MERGE_FILE  "MBR-PROT\\MBR-PROT.BIN"    // MBR Protection Image.
    56 #endif
    57 #define     OUT_FILE    "AIRBOOT.BIN"               // Generated loader image.
     55#define     MERGE_FILE  "mbr-prot\\mbr-prot.bin"    // MBR Protection Image.
     56#endif
     57#define     OUT_FILE    "airboot.bin"               // Generated loader image.
    5858
    5959
    … …  
    200200
    201201    /*
    202     // Write AIRBOOT.BIN
     202    // Write 'airboot.bin'
    203203    */
    204204    printf("%s", WriteCode);
Note: See TracChangeset for help on using the changeset viewer.