Ignore:
Timestamp:
Feb 18, 2016, 5:18:51 PM (9 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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/os2/setaboot/Makefile

    r55 r60  
    11###############################################################################
    2 # Makefile :: Builds the SET(A)BOOT Helper for several platforms.     [wmake] #
     2# Makefile :: Builds the 'set(a)boot' 'setboot' replacement for OS/2  [wmake] #
    33###############################################################################
    44# rousseau@ecomstation.com
    5 #
    6 # Derived from the INSTALL Makefile.
    7 #
    8 
    9 #
    10 # This Makefile builds the SET(A)BOOT Helper for DOS, Windows, OS/2 and Linux.
    11 # Like FIXCODE, each platform version has a letter appended it:
    12 # 'D' for DOS, 'W' for Windows, '2' for OS/2 and 'L' for Linux.
     5
     6
     7#
     8# This Makefile builds the 'set(a)boot' 'setboot' replacement for OS/2.
    139#
    1410
     
    1713# This is used to compensate for the differences between the target platforms.
    1814#
    19 !include        ../../../INCLUDE/MAKEFILE.MIF
     15!include        ../../../include/makefile.mif
    2016
    2117
     
    4642# Base Name of Source Program to compile.
    4743#
    48 BASENAME=SETABOOT
     44BASENAME=setaboot
    4945
    5046#
     
    5854# This is a list of the Targets to be built.
    5955#
    60 #TARGETS=$(MODULE)D.EXE $(MODULE)W.EXE $(MODULE)2.EXE $(MODULE)L.ELF
    61 TARGETS=$(MODULE).EXE
     56#TARGETS=$(MODULE)d.exe $(MODULE)w.exe $(MODULE)2.exe $(MODULE)l.elf
     57TARGETS=$(MODULE).exe
    6258
    6359#
     
    8379# -Cp   = case sensitive symbols
    8480# -zcw  = no _ prefix on symbols (C model)
    85 ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Fo$^. -Fl=$^&.LST -Fw$^&.ERR
    86 ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Zd -Zi -Fo$^. -Sa -Fl=$^&.LST -Fw$^&.ERR
    87 ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Zd -Zi -Fo$^. -Sa -Fl=$^&.LST -Fw$^&.ERR
     81ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Fo$^. -Fl=$^&.lst -Fw$^&.err
     82ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Zd -Zi -Fo$^. -Sa -Fl=$^&.lst -Fw$^&.err
     83ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Zd -Zi -Fo$^. -Sa -Fl=$^&.lst -Fw$^&.err
    8884!elseif "$(ASM)"=="wasm"
    89 ASM_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -fo=$^. -fr=$^&.ERR
    90 ASM_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -d1 -fo=$^. -fr=$^&.ERR
    91 ASM_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -d1 -fo=$^. -fr=$^&.ERR
     85ASM_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -fo=$^. -fr=$^&.err
     86ASM_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -d1 -fo=$^. -fr=$^&.err
     87ASM_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -d1 -fo=$^. -fr=$^&.err
    9288!elseif "$(ASM)"=="tasm"
    9389# -ml   = case sensitive symbols
     
    9692ASM_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -t -ml -z -zi -c -la
    9793!elseif "$(ASM)"=="alp"
    98 ASM_FLAGS_D0=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Feo:OBJ +Fl +Fel:LST +Fm +Fem:ERR
    99 ASM_FLAGS_D1=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Od:MS16 +Feo:OBJ +Fl +Fel:LST +Fm +Fem:ERR
     94ASM_FLAGS_D0=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Feo:obj +Fl +Fel:lst +Fm +Fem:err
     95ASM_FLAGS_D1=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Od:MS16 +Feo:obj +Fl +Fel:lst +Fm +Fem:err
    10096ASM_FLAGS_D2=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP
    10197!else
     
    109105MM16=-ml
    110106CC16=wcc
    111 CC16_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM16) -w4 -e25 -zq -otexan -fo=$^. -fr=$^&.ERR
    112 CC16_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM16) -d2 -w4 -e25 -zq -od -fo=$^. -fr=$^&.ERR
    113 CC16_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM16) -d3 -w4 -e25 -zq -od -fo=$^. -fr=$^&.ERR
     107CC16_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM16) -w4 -e25 -zq -otexan -fo=$^. -fr=$^&.err
     108CC16_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM16) -d2 -w4 -e25 -zq -od -fo=$^. -fr=$^&.err
     109CC16_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM16) -d3 -w4 -e25 -zq -od -fo=$^. -fr=$^&.err
    114110CC16_FLAGS=$(CC16_FLAGS_D$(DEBUG_LEVEL))
    115111
     
    119115MM32=-mf
    120116CC32=wcc386
    121 CC32_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -w4 -e25 -zq -otexan -6r -fo=$^. -fr=$^&.ERR
    122 CC32_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -d2 -w4 -e25 -zq -od -6r -fo=$^. -fr=$^&.ERR
    123 CC32_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -d3 -w4 -e25 -zq -od -6r -fo=$^. -fr=$^&.ERR
     117CC32_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -w4 -e25 -zq -otexan -6r -fo=$^. -fr=$^&.err
     118CC32_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -d2 -w4 -e25 -zq -od -6r -fo=$^. -fr=$^&.err
     119CC32_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -d3 -w4 -e25 -zq -od -6r -fo=$^. -fr=$^&.err
    124120CC32_FLAGS=$(CC32_FLAGS_D$(DEBUG_LEVEL))
    125121
     
    133129# WLink/2 can use the '\x40' variant.
    134130#
    135 #~ LNK_FLAGS_D0=op q op v op map=$^&.MAP op de '\x40\x23KIEWITZ:1.18\x23\x40\x41iR-BOOT Installer by Kiewitz'
    136 LNK_FLAGS_D0=op q op v op map=$^&.MAP
     131#~ LNK_FLAGS_D0=op q op v op map=$^&.map op de '\x40\x23KIEWITZ:1.18\x23\x40\x41iR-BOOT Installer by Kiewitz'
     132LNK_FLAGS_D0=op q op v op map=$^&.map
    137133#~ LNK_FLAGS_D1=op q op v d all &
    138134        #~ order clname CODE clname FAR_CONST clname FAR_DATA clnam BEGDATA clname DATA clname BSS clname STACK clname BLAP NOE &
    139         #~ op map=$^&.MAP
    140 LNK_FLAGS_D1=op q op v d all op map=$^&.MAP
    141 LNK_FLAGS_D2=op q op v d all op map=$^&.MAP
     135        #~ op map=$^&.map
     136LNK_FLAGS_D1=op q op v d all op map=$^&.map
     137LNK_FLAGS_D2=op q op v d all op map=$^&.map
    142138LNK_FLAGS=$(LNK_FLAGS_D$(DEBUG_LEVEL))
    143139
     
    188184        @echo.
    189185        @echo =====================================================================
    190         @echo = PROGRAM: SETABOOT Multi Platform   [DOS, Win32, OS/2 and Linux] =
     186        @echo = PROGRAM: 'setaboot', setboot replacement for OS/2          [OS/2] =
    191187        @echo =====================================================================
    192188#       @echo.
     
    251247# OS/2 32-bits (LX)
    252248###############################################################################
    253 $(MODULE).EXE:  $(MODULE).OBJ
    254         $(LNK) $(LNK_FLAGS) file $^&.OBJ name $^. sys os2v2
     249$(MODULE).exe:  $(MODULE).obj
     250        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys os2v2
    255251        @if exist $^. @echo             $^. $(MSG_SUCCESS)
    256252        @echo.
    257253        #~ wstrip $^.
    258254
    259 $(MODULE).OBJ:  $(BASENAME).C $(BASENAME).H
     255$(MODULE).obj:  $(BASENAME).c $(BASENAME).h
    260256#       @echo.
    261         @echo TARGET: $^&.EXE   [OS/2 32-bits Executable]
    262         $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=os2 $(BASENAME).C
    263         @wdis -fi $^. > $^&.WDA
     257        @echo TARGET: $^&.exe   [OS/2 32-bits Executable]
     258        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=os2 $(BASENAME).c
     259        @wdis -fi $^. > $^&.wda
    264260
    265261
     
    281277clean:  .SYMBOLIC
    282278        @for %%i in ($(TARGETS)) do @if exist %%i $(RM) %%i
    283         @if exist *.OBJ $(RM) *.OBJ
    284         @if exist *.WDA $(RM) *.WDA
    285         @if exist *.NDA $(RM) *.NDA
    286         @if exist *.MAP $(RM) *.MAP
    287         @if exist *.LST $(RM) *.LST
    288         @if exist *.ERR $(RM) *.ERR
     279        @if exist *.obj $(RM) *.obj
     280        @if exist *.wda $(RM) *.wda
     281        @if exist *.nda $(RM) *.nda
     282        @if exist *.map $(RM) *.map
     283        @if exist *.lst $(RM) *.lst
     284        @if exist *.err $(RM) *.err
    289285        @if exist *.o   $(RM) *.o
    290286
     
    292288# DISTRIBUTE TO RELEASE SPACE
    293289# -----------------------------------------------------------------------------
    294 # This distributes all .BIN files to BOOTCODE.
    295 # Then it installs the English version to RELEASES as AIRBOOT.BIN.
     290# This distributes 'setaboot' 'release'.
    296291# -----------------------------------------------------------------------------
    297292dist:   .SYMBOLIC
    298         @if exist *.EXE $(CP) *.EXE ..$(DS)..$(DS)..$(DS)RELEASE$(DS)OS2
    299 #       @if exist *.EXE $(CP) *.EXE ..$(DS)..$(DS)..$(DS)RELEASE$(DS)BOOTCODE
     293        @if exist *.exe $(CP) *.exe ..$(DS)..$(DS)..$(DS)release$(DS)os2
    300294#
    301295# Help on using this Makefile.
Note: See TracChangeset for help on using the changeset viewer.