Changeset 4821 for trunk/include


Ignore:
Timestamp:
Dec 17, 2000, 12:40:54 AM (25 years ago)
Author:
bird
Message:

Added rule to make .def-file with bldlevel info. This new .def-file is
used when linking the EXEs and DLLs.
This change _require_ every EXE to have a corresponding .DEF-file.

Location:
trunk/include
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/odin32.post.emx.mk

    r4732 r4821  
    1 # $Id: odin32.post.emx.mk,v 1.7 2000-12-03 05:14:29 bird Exp $
     1# $Id: odin32.post.emx.mk,v 1.8 2000-12-16 23:40:53 bird Exp $
    22
    33#
    … …  
    8181!endif
    8282
    83 # Set default DEFFILE if needed. (Currently for dlls only.)
     83# Set default DEFFILE if needed. (Required for both DLLs and EXEs!)
    8484!ifndef DEFFILE
    85 !   ifndef EXETARGET
    8685DEFFILE = $(ORGTARGET).def
    87 !   endif
    8886!endif
    8987
    … …  
    135133#
    136134!ifndef NO_MAIN_RULE
    137 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
     135$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(DEFFILE) $(OBJDIR)\$(TARGET).lrf
    138136    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    139137!ifdef OS2RES
    … …  
    147145#
    148146!ifndef NO_LNKFILE_RULE
    149 $(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
     147$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.vac3.mk
    150148    @echo Creating file <<$@
    151149/OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    … …  
    155153$(LIBS:  =^
    156154)
    157 $(DEFFILE)
     155$(OBJDIR)\bldlevel.$(DEFFILE)
    158156<<keep
    159157!endif
    … …  
    191189#
    192190!ifndef NO_MAIN_RULE
    193 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
     191$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(DEFFILE) $(OBJDIR)\$(TARGET).lrf
    194192    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    195193!ifdef OS2RES
    … …  
    203201#
    204202!ifndef NO_LNKFILE_RULE
    205 $(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
     203$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.vac3.mk
    206204    @echo Creating file <<$@
    207205/OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    … …  
    211209$(LIBS:  =^
    212210)
    213 $(DEFFILE)
     211$(OBJDIR)\bldlevel.$(DEFFILE)
    214212<<keep
    215213!endif
    … …  
    388386
    389387#
     388# Common: Make .def-file with buildlevel info.
     389#
     390$(OBJDIR)\bldlevel.$(DEFFILE): $(DEFFILE)
     391    $(BLDLEVELINF) $(DEFFILE) $@ -R"$(DEFFILE)" \
     392        -V"#define=ODIN32_VERSION,$(ODIN32_INCLUDE)\versionos2.h" \
     393        -M"#define=ODIN32_BUILD_NR,$(ODIN32_INCLUDE)\versionos2.h"
     394
     395
     396#
    390397# Common: Create the object directory.
    391398#
    392399$(OBJDIR):
    393400    @if not exist $(OBJDIR) $(CREATEPATH) $(OBJDIR)
     401
     402
     403#
     404# Common: Generate Visual SlickEdit project.
     405#
     406!ifndef NO_VSLICKRULES
     407!ifdef ORGTARGET
     408vslick $(ORGTARGET).vpj:
     409    $(RM) $(ORGTARGET).vtg
     410    $(ODIN32_BASE)\tools\vslick\genproject.cmd $(CINCLUDES) $(ORGTARGET).vpj
     411!endif
     412!endif
    394413
    395414

  • trunk/include/odin32.post.vac3.mk

    r4732 r4821  
    1 # $Id: odin32.post.vac3.mk,v 1.7 2000-12-03 05:14:29 bird Exp $
     1# $Id: odin32.post.vac3.mk,v 1.8 2000-12-16 23:40:54 bird Exp $
    22
    33#
    … …  
    7676!endif
    7777
    78 # Set default DEFFILE if needed. (Currently for dlls only.)
     78# Set default DEFFILE if needed. (Required for both DLLs and EXEs!)
    7979!ifndef DEFFILE
    80 !   ifndef EXETARGET
    8180DEFFILE = $(ORGTARGET).def
    82 !   endif
    8381!endif
    8482
    … …  
    130128#
    131129!ifndef NO_MAIN_RULE
    132 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
     130$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(DEFFILE) $(OBJDIR)\$(TARGET).lrf
    133131    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    134132!ifdef OS2RES
    … …  
    142140#
    143141!ifndef NO_LNKFILE_RULE
    144 $(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
     142$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.vac3.mk
    145143    @echo Creating file <<$@
    146144/OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    … …  
    150148$(LIBS:  =^
    151149)
    152 $(DEFFILE)
     150$(OBJDIR)\bldlevel.$(DEFFILE)
    153151<<keep
    154152!endif
    … …  
    186184#
    187185!ifndef NO_MAIN_RULE
    188 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
     186$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(DEFFILE) $(OBJDIR)\$(TARGET).lrf
    189187    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    190188!ifdef OS2RES
    … …  
    198196#
    199197!ifndef NO_LNKFILE_RULE
    200 $(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
     198$(OBJDIR)\$(TARGET).lrf: $(MAKEFILE) $(ODIN32_INCLUDE)\odin32.post.vac3.mk
    201199    @echo Creating file <<$@
    202200/OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    … …  
    206204$(LIBS:  =^
    207205)
    208 $(DEFFILE)
     206$(OBJDIR)\bldlevel.$(DEFFILE)
    209207<<keep
    210208!endif
    … …  
    383381
    384382#
     383# Common: Make .def-file with buildlevel info.
     384#
     385$(OBJDIR)\bldlevel.$(DEFFILE): $(DEFFILE)
     386    $(BLDLEVELINF) $(DEFFILE) $@ -R"$(DEFFILE)" \
     387        -V"#define=ODIN32_VERSION,$(ODIN32_INCLUDE)\versionos2.h" \
     388        -M"#define=ODIN32_BUILD_NR,$(ODIN32_INCLUDE)\versionos2.h"
     389
     390
     391#
    385392# Common: Create the object directory.
    386393#
    387394$(OBJDIR):
    388395    @if not exist $(OBJDIR) $(CREATEPATH) $(OBJDIR)
     396
     397
     398#
     399# Common: Generate Visual SlickEdit project.
     400#
     401!ifndef NO_VSLICKRULES
     402!ifdef ORGTARGET
     403vslick $(ORGTARGET).vpj:
     404    $(RM) $(ORGTARGET).vtg
     405    $(ODIN32_BASE)\tools\vslick\genproject.cmd $(CINCLUDES) $(ORGTARGET).vpj
     406!endif
     407!endif
    389408
    390409

  • trunk/include/odin32.post.wat.mk

    r4732 r4821  
    1 # $Id: odin32.post.wat.mk,v 1.7 2000-12-03 05:14:29 bird Exp $
     1# $Id: odin32.post.wat.mk,v 1.8 2000-12-16 23:40:54 bird Exp $
    22
    33#
    … …  
    99#
    1010# Define NOTEXPDEF to remove the $(TARGET).lib and $(TARGET)exp.def rules.
    11 # Define EXETARGET to make an executable. (This also applies to pdwin32.mk.)
     11# Define EXETARGET to make an executable. (This also applies to odin32.mk.)
    1212# Define LIBTARGET to make an internal library.
    1313# Define LOCALCLEAN if only the local directory is to be clean.
    … …  
    6868!endif
    6969
    70 # Set default DEFFILE if needed. (Currently for dlls only.)
     70# Set default DEFFILE if needed. (Required for both DLLs and EXEs!)
    7171!ifndef DEFFILE
    72 !   ifndef EXETARGET
    7372DEFFILE = $(ORGTARGET).def
    74 !   endif
    7573!endif
    7674
    … …  
    122120#
    123121!ifndef NO_MAIN_RULE
    124 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
     122$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(OBJDIR)\$(TARGET).lrf
    125123    $(LD2) @$(OBJDIR)\$(TARGET).lrf
    126124!ifdef OS2RES
    … …  
    134132#
    135133!ifndef NO_LNKFILE_RULE
    136 $(OBJDIR)\$(TARGET).lrf: makefile $(DEFFILE) $(ODIN32_INCLUDE)\pdwin32.wat.post
     134$(OBJDIR)\$(TARGET).lrf: $(__MAKEFILES__) $(OBJDIR)\bldlevel.$(DEFFILE) $(DEFFILE) $(ODIN32_INCLUDE)\odin32.post.wat.mk
    137135    $(RM) $(OBJDIR)\$(TARGET).lrf2 $@
    138     $(KDEF2WAT) $(DEFFILE) $@ <<$(OBJDIR)\$(TARGET).lrf2
     136    $(KDEF2WAT) $(OBJDIR)\bldlevel.$(DEFFILE) $@ <<$(OBJDIR)\$(TARGET).lrf2
    139137$(LD2FLAGS)
    140138name $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    … …  
    177175#
    178176!ifndef NO_MAIN_RULE
    179 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
     177$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(OBJDIR)\$(TARGET).lrf
    180178    $(LD2) @$(OBJDIR)\$(TARGET).lrf
    181179!ifdef OS2RES
    … …  
    189187#
    190188!ifndef NO_LNKFILE_RULE
    191 $(OBJDIR)\$(TARGET).lrf: makefile  $(ODIN32_INCLUDE)\pdwin32.wat.post $(DEFFILE)
     189$(OBJDIR)\$(TARGET).lrf: $(__MAKEFILES__) $(ODIN32_INCLUDE)\odin32.post.wat.mk $(OBJDIR)\bldlevel.$(DEFFILE)
    192190    $(RM) $(OBJDIR)\$(TARGET).lrf2 $@
    193191!ifdef DEFFILE
    194     $(KDEF2WAT) $(DEFFILE) $@ <<$(OBJDIR)\$(TARGET).lrf2
     192    $(KDEF2WAT) $(OBJDIR)\bldlevel.$(DEFFILE) $@ <<$(OBJDIR)\$(TARGET).lrf2
    195193!else
    196194    $(ECHO) Creating <<$@
    … …  
    374372
    375373#
     374# Common: Make .def-file with buildlevel info.
     375#
     376$(OBJDIR)\bldlevel.$(DEFFILE): $(DEFFILE)
     377    $(BLDLEVELINF) $(DEFFILE) $@ -R"$(DEFFILE)" \
     378        -V"#define=ODIN32_VERSION,$(ODIN32_INCLUDE)\versionos2.h" \
     379        -M"#define=ODIN32_BUILD_NR,$(ODIN32_INCLUDE)\versionos2.h"
     380
     381
     382#
    376383# Common: Create the object directory.
    377384#
    378385$(OBJDIR): .SYMBOLIC
    379386    @if not exist $(OBJDIR) $(CREATEPATH) $(OBJDIR)
     387
     388
     389#
     390# Common: Generate Visual SlickEdit project.
     391#
     392!ifndef NO_VSLICKRULES
     393!ifdef ORGTARGET
     394vslick $(ORGTARGET).vpj: .SYMBOLIC
     395    $(RM) $(ORGTARGET).vtg
     396    $(ODIN32_BASE)\tools\vslick\genproject.cmd $(CINCLUDES) $(ORGTARGET).vpj
     397!endif
     398!endif
    380399
    381400
Note: See TracChangeset for help on using the changeset viewer.