Changeset 10301 for trunk/include


Ignore:
Timestamp:
Oct 26, 2003, 2:47:51 AM (22 years ago)
Author:
bird
Message:

Synced over pe_*.obj custombuild changes.

Location:
trunk/include
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/odin32.mk

    r9876 r10301  
    1 # $Id: odin32.mk,v 1.9 2003-02-28 10:28:10 sandervl Exp $
     1# $Id: odin32.mk,v 1.10 2003-10-26 01:47:50 bird Exp $
    22
    33#
    … …  
    7171!endif
    7272
     73#
     74# Altern configuration if we're making the custom build object library.
     75#
     76CUST =
     77!if "$(CUSTOMBUILD)" == "1"
     78!   ifndef LIBTARGET
     79!       ifndef PUBLICLIB
     80CUST        = o
     81DIREXT2     = .cust
     82LIBTARGET   = 1
     83PUBLICLIB   = 1
     84WRC_PREFIX_RESOURCE=1
     85!       else
     86CUSTOMBUILD = 0
     87!       endif
     88!   else
     89CUSTOMBUILD = 0
     90!   endif
     91!endif
     92
    7393
    7494#
    … …  
    119139!   ifdef DEBUG
    120140!       ifndef PROFILE
    121 OBJDIR   = .\bin\Debug$(DIREXT)
    122 !       else
    123 OBJDIR   = .\bin\Profile$(DIREXT)
     141OBJDIR   = .\bin\Debug$(DIREXT)$(DIREXT2)
     142!       else
     143OBJDIR   = .\bin\Profile$(DIREXT)$(DIREXT2)
    124144!       endif
    125145!   else
    126146!       ifdef PROFILE
    127 OBJDIR   = .\bin\Profile$(DIREXT)
    128 !       else
    129 OBJDIR   = .\bin\Release$(DIREXT)
     147OBJDIR   = .\bin\Profile$(DIREXT)$(DIREXT2)
     148!       else
     149OBJDIR   = .\bin\Release$(DIREXT)$(DIREXT2)
    130150!       endif
    131151!   endif
    … …  
    144164#
    145165COMMONRULES = cleanall clean dep lib all nothing
    146 
    147 
    148 #
    149 # Altern configuration if we're making the custom build object library.
    150 #
    151 CUST =
    152 !if "$(CUSTOMBUILD)" == "1"
    153 !   ifndef LIBTARGET
    154 !       ifndef PUBLICLIB
    155 CUST        = o
    156 LIBTARGET   = 1
    157 PUBLICLIB   = 1
    158 WRC_PREFIX_RESOURCE=1
    159 !       else
    160 CUSTOMBUILD = 0
    161 !       endif
    162 !   else
    163 CUSTOMBUILD = 0
    164 !   endif
    165 !endif
    166166
    167167

  • trunk/include/odin32.post.mk

    r9876 r10301  
    1 # $Id: odin32.post.mk,v 1.9 2003-02-28 10:28:10 sandervl Exp $
     1# $Id: odin32.post.mk,v 1.10 2003-10-26 01:47:50 bird Exp $
    22
    33#
    … …  
    2828# Altern configuration if we're making the custom build object library.
    2929#
     30!ifndef NO_CUSTOMBUILD
    3031!if "$(CUSTOMBUILD)" == "1"
     32!if "$(EXETARGET)" == ""
     33!ifdef LIBS
     34!ifdef NOPEHDR
    3135OBJS = $(OBJS:initterm.obj=dummy.obj)
     36!else
     37OBJS = $(OBJS:initterm.obj=dummy.obj) \
     38$(OBJDIR)\pe_$(ORGTARGET).obj
    3239!endif
    33 
     40!endif
     41!endif
     42!endif
     43!endif
    3444
    3545#

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

    r9876 r10301  
    1 # $Id: odin32.post.vac3.mk,v 1.29 2003-02-28 10:28:10 sandervl Exp $
     1# $Id: odin32.post.vac3.mk,v 1.30 2003-10-26 01:47:51 bird Exp $
    22
    33#
    … …  
    445445
    446446
     447!ifndef NOPEHDR
     448#
     449# Common: Make the pe_$(ORGTARGET).obj
     450#
     451$(OBJDIR)\pe_$(ORGTARGET).obj: $(DEFFILE) $(PEBUILD)
     452        $(PEBUILD) $(ORGTARGET) $(DEFFILE) > $(@R).asm
     453    $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $(@R).asm
     454!endif
     455
    447456#
    448457# Common: Create the object directory.

  • trunk/include/odin32.tools.mk

    r7589 r10301  
    1 # $Id: odin32.tools.mk,v 1.10 2001-12-09 15:00:04 bird Exp $
     1# $Id: odin32.tools.mk,v 1.11 2003-10-26 01:47:51 bird Exp $
    22
    33#
    … …  
    5050LXLITE      = $(ODIN32_TOOLS)\lxlite.exe
    5151CMDQD       = $(ODIN32_TOOLS)\cmdqd.exe
     52PEBUILD         = $(ODIN32_TOOLS)\PEBuild.exe
    5253DEPEND      = $(ODIN32_TOOLS)\fastdep.exe -o$$(OBJDIR) -cy+ -xdummy.c
    5354!ifdef MAKEFLAGS
Note: See TracChangeset for help on using the changeset viewer.