Changeset 4636 for trunk/include


Ignore:
Timestamp:
Nov 20, 2000, 12:53:47 AM (25 years ago)
Author:
bird
Message:

Adjustments and corrections.
1) Flag macros can't be added and added and added and added to - NMAKE don't

support it.

2) Use CreatePath.cmd to makesure that OBJDIR any target directory for a

copy (CP) operation exists.

Location:
trunk/include
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/pdwin32.tools

    r4620 r4636  
    1 # $Id: pdwin32.tools,v 1.15 2000-11-19 08:31:20 bird Exp $
     1# $Id: pdwin32.tools,v 1.16 2000-11-19 23:53:46 bird Exp $
    22# ODIN / win32os2 Project
    33#
    … …  
    3838IMPDEF      = $(PDWIN32_TOOLS)\impdef.exe
    3939DEPEND      = $(PDWIN32_TOOLS)\fastdep.exe -o$$(OBJDIR) -cy+
     40CREATEPATH  = $(PDWIN32_TOOLS)\CreatePath.cmd
    4041
    4142#Svl: Remove this when everything has been converted to the new build rules

  • trunk/include/pdwin32.vac3.dbg

    r4620 r4636  
    1 # $Id: pdwin32.vac3.dbg,v 1.31 2000-11-19 08:31:20 bird Exp $
     1# $Id: pdwin32.vac3.dbg,v 1.32 2000-11-19 23:53:47 bird Exp $
    22# ODIN / win32os2 Project
    33#
    … …  
    77#
    88
     9
     10#
     11# Library macros.
     12#
    913SOMLIB   = somtk.lib
    1014RTLLIB   = cppom30.lib
    1115RTLLIB_O = cppom30o.lib
    1216DLLENTRY = $(PDWIN32_LIB)\dllentry.obj
     17ODINCRT  = odincrtd
    1318
     19
     20#
     21# Object directory.
     22#
    1423OBJDIR   = .\bin\debug
     24
    1525
    1626#
    … …  
    2737OS2RC  = rc
    2838
    29 ODINCRT = odincrtd
    3039
    3140#
    3241# Tool Flags
    3342#
    34 CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+
    35 CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ /Gx+
    36 CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- /Gx+
    37 CFLAGS_WIN32APP  = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+
    38 CXXFLAGS_WIN32APP= -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+
    39 
    40 CINCLUDES        = -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE)
    41 CDEFINES         = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__ -DTCPV40HDRS -DCOMCTL32UNDOC
    42 CDEFINES_ODINCRT = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__
    43 CDEFINES_WIN32APP= -DDEBUG -D__WIN32OS2__ -D__i386__
    44 
    45 !ifdef DEBUGALL
    46 CFLAGS           = $(CFLAGS) -DDEBUG_ENABLELOG_LEVEL2
    47 CXXFLAGS         = $(CXXFLAGS) -DDEBUG_ENABLELOG_LEVEL2
    48 !endif
    49 
    5043ASFLAGS          = -Mb -Sc -Sv:ALP +Od -D:DEBUG
    51 LDFLAGS          = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /NOD /dbgpack /packcode /packdata /exepack:2"
    52 LDFLAGS_ODINCRT  = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /dbgpack /packcode /packdata /exepack:2"
    53 LD2FLAGS         = /nologo /DE /noe /map /NOD /dbgpack /packcode /packdata /exepack:2
    54 LD2FLAGS_ODINCRT = /nologo /DE /noe /map /dbgpack /packcode /packdata /exepack:2
    5544IMPLIBFLAGS      = /nologo
    5645ILIBFLAGS        = /quiet /nologo
    … …  
    5948OS2RCLFLAGS      = -x2 -n
    6049
     50
     51#
     52# C Compiler flags.
     53#   This may look a bit like a mess but, there is usually a reason behind
     54#   every line and the way it is done. We have some problems with nmake
     55#   when we add new flags to for example CXXFLAGS too many times.
     56#
     57!ifdef EXETARGET
     58CTARGETFLAGS     = -Ge+
     59CXXTARGETFLAGS   = -Ge+
     60!else
     61CTARGETFLAGS     = -Ge-
     62CXXTARGETFLAGS   = -Ge-
     63!endif
     64CFLAGS           = -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(CTARGETFLAGS)
     65CXXFLAGS         = -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(CXXTARGETFLAGS) /Gx+
     66CXXFLAGS_ODINCRT = -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn- $(CXXTARGETFLAGS) /Gx+
     67CFLAGS_WIN32APP  = -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(CTARGETFLAGS)
     68CXXFLAGS_WIN32APP= -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(CXXTARGETFLAGS)
     69CINCLUDES        = -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE)
     70CDEFINES_WIN32APP= -DDEBUG -D__WIN32OS2__ -D__i386__
     71CDEFINES_ODINCRT = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__
     72CDEFINES         = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__ -DTCPV40HDRS -DCOMCTL32UNDOC \
     73!ifdef DEBUGALL
     74                   -DDEBUG_ENABLELOG_LEVEL2 \
     75!endif
    6176!ifdef NODEBUGINFO
    62 LDFLAGS          = $(LDFLAGS) /B"/nodebug /nodbgpack"
    63 LDFLAGS_ODINCRT  = $(LDFLAGS_ODINCRT) /B"/nodebug /nodbgpack"
    64 LD2FLAGS         = $(LD2FLAGS) /nodebug /nodbgpack
    65 LD2FLAGS_ODINCRT = $(LD2FLAGS_ODINCRT) /nodebug  /nodbgpack
    66 CFLAGS           = $(CFLAGS) -DDEFAULT_LOGGING_OFF
    67 CXXFLAGS         = $(CXXFLAGS) -DDEFAULT_LOGGING_OFF
     77                   -DDEFAULT_LOGGING_OFF
    6878!endif
    6979
     80
     81#
     82# Linker flags.
     83#   This may look a bit like a mess but, there is usually a reason behind
     84#   every line and the way it is done. We have some problems with nmake
     85#   when we add new flags to for example LD2FLAGS too many times.
     86#
    7087!ifdef EXETARGET
    71 CFLAGS           = $(CFLAGS) -Ge+ -Gn-
    72 CXXFLAGS         = $(CXXFLAGS) -Ge+ -Gn-
    73 LDFLAGS          = $(LDFLAGS) -Ge+
    74 LDFLAGS_ODINCRT  = $(LDFLAGS_ODINCRT) -Ge+
    75 LD2FLAGS         = $(LD2FLAGS) /EXEC
    76 LD2FLAGS_ODINCRT = $(LD2FLAGS_ODINCRT) /EXEC
     88LDTARGETFLAGS    = -Ge+
     89LD2TARGETFLAGS   = /EXEC
     90!else
     91LDTARGETFLAGS    = -Ge-
     92LD2TARGETFLAGS   = /DLL
    7793!endif
     94!ifdef NODEBUGINFO
     95LDFLAGS          = -Q   /B"/noe /map /packcode /packdata /exepack:2 /nodebug /nodbgpack /nod" -Si -W3 -Gm+ $(LDTARGETFLAGS)
     96LDFLAGS_ODINCRT  = -Q   /B"/noe /map /packcode /packdata /exepack:2 /nodebug /nodbgpack"      -Si -W3 -Gm+ $(LDTARGETFLAGS)
     97LD2FLAGS         = /nologo /noe /map /packcode /packdata /exepack:2 /nodebug /nodbgpack /nod $(LD2TARGETFLAGS)
     98LD2FLAGS_ODINCRT = /nologo /noe /map /packcode /packdata /exepack:2 /nodebug /nodbgpack      $(LD2TARGETFLAGS)
     99!else
     100LDFLAGS          = -Q   /B"/noe /map /packcode /packdata /exepack:2 /dbgpack /nod" -Ti -Si -W3 -Gm+ $(LDTARGETFLAGS)
     101LDFLAGS_ODINCRT  = -Q   /B"/noe /map /packcode /packdata /exepack:2 /dbgpack "     -Ti -Si -W3 -Gm+ $(LDTARGETFLAGS)
     102LD2FLAGS         = /nologo /noe /map /packcode /packdata /exepack:2 /dbgpack /nod /debug $(LD2TARGETFLAGS)
     103LD2FLAGS_ODINCRT = /nologo /noe /map /packcode /packdata /exepack:2 /dbgpack      /debug $(LD2TARGETFLAGS)
     104!endif
     105

  • trunk/include/pdwin32.vac3.post

    r4620 r4636  
    1 # $Id: pdwin32.vac3.post,v 1.4 2000-11-19 08:31:20 bird Exp $
     1# $Id: pdwin32.vac3.post,v 1.5 2000-11-19 23:53:47 bird Exp $
    22#
    33# Odin32 API
    … …  
    132132/OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    133133/MAP:$(OBJDIR)\$(TARGET).map
    134 $(OBJS)
    135 $(LIBS)
     134$(OBJS:  =^
     135)
     136$(LIBS:  =^
     137)
    136138$(DEFFILE)
    137139<<keep
    … …  
    185187/OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    186188/MAP:$(OBJDIR)\$(TARGET).map
    187 $(OBJS)
    188 $(LIBS) $(DEFFILE)
     189$(OBJS:  =^
     190)
     191$(LIBS:  =^
     192)
     193$(DEFFILE)
    189194<<keep
    190195!endif
    … …  
    236241    $(RM) $@
    237242    $(ILIB) $(ILIBFLAGS) $@ @<<
    238 $(OBJS:  = &^
     243$(OBJS:  =&^
    239244)
    240245$(OBJDIR)\$(@B).lst
    … …  
    285290#
    286291$(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
     292    @if not exist $(@D) $(CREATEPATH) $(@D)
    287293    $(CP) $** $@
    288294
    … …  
    292298#
    293299$(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION): $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
     300    @if not exist $(@D) $(CREATEPATH) $(@D)
    294301    $(CP) $** $@
    295302!ifndef NO_MAIN_BIN_COPY
    … …  
    302309#
    303310$(PDWIN32_BIN)\$(TARGET).sym: $(OBJDIR)\$(TARGET).sym
     311    @if not exist $(@D) $(CREATEPATH) $(@D)
    304312    $(CP) $** $@
    305313!ifndef NO_MAIN_BIN_COPY
    … …  
    342350#
    343351$(OBJDIR):
    344     @if not exist bin $(MKDIR) bin
    345     @if not exist $(OBJDIR) $(MKDIR) $(OBJDIR)
     352    @if not exist $(OBJDIR) $(CREATEPATH) $(OBJDIR)
    346353
    347354

  • trunk/include/pdwin32.vac3.rel

    r4620 r4636  
    1 # $Id: pdwin32.vac3.rel,v 1.29 2000-11-19 08:31:20 bird Exp $
     1# $Id: pdwin32.vac3.rel,v 1.30 2000-11-19 23:53:47 bird Exp $
    22# ODIN / win32os2 Project
    33#
    … …  
    77#
    88
     9
     10#
     11# Library macros.
     12#
    913SOMLIB   = somtk.lib
    1014RTLLIB   = cppom30.lib
    1115RTLLIB_O = cppom30o.lib
    1216DLLENTRY = $(PDWIN32_LIB)\dllentry.obj
     17ODINCRT  = odincrt
    1318
     19
     20#
     21# Object directory.
     22#
    1423OBJDIR   = .\bin\release
     24
    1525
    1626#
    … …  
    2737OS2RC  = rc
    2838
    29 ODINCRT = odincrt
    3039
    3140#
    3241# Tool Flags
    3342#
    34 CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+
    35 CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ /Gx+
    36 CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- /Gx+
    37 CFLAGS_WIN32APP  = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+
    38 CXXFLAGS_WIN32APP= -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+
    39 
    40 CINCLUDES        = -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE)
    41 CDEFINES         = -D__WIN32OS2__ -D__WINE__ -D__i386__ -DTCPV40HDRS -DCOMCTL32UNDOC
    42 CDEFINES_ODINCRT = -D__WIN32OS2__ -D__WINE__ -D__i386__
    43 CDEFINES_WIN32APP= -D__WIN32OS2__ -D__i386__
    44 
    4543ASFLAGS          = -Mb -Sc -Sv:ALP
    46 LDFLAGS          = -Q -Si -G5 -O+ -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /packcode /packdata /exepack:2 /nod"
    47 LDFLAGS_ODINCRT  = -Q -Si -G5 -O+ -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /packcode /packdata /exepack:2"
    48 LD2FLAGS         = /nologo /noe /map /packcode /packdata /exepack:2 /nod /nodebug
    49 LD2FLAGS_ODINCRT = /nologo /noe /map /packcode /packdata /exepack:2 /nodebug
    5044IMPLIBFLAGS      = /nologo
    5145ILIBFLAGS        = /quiet /nologo
    … …  
    5448OS2RCLFLAGS      = -x2 -n
    5549
     50
     51#
     52# C Compiler flags.
     53#   This may look a bit like a mess but, there is usually a reason behind
     54#   every line and the way it is done. We have some problems with nmake
     55#   when we add new flags to for example CXXFLAGS too many times.
     56#
    5657!ifdef EXETARGET
    57 CFLAGS           = $(CFLAGS) -Ge+ -Gn-
    58 CXXFLAGS         = $(CXXFLAGS) -Ge+ -Gn-
    59 LDFLAGS          = $(LDFLAGS) -Ge+
    60 LDFLAGS_ODINCRT  = $(LDFLAGS_ODINCRT) -Ge+
    61 LD2FLAGS         = $(LD2FLAGS) /EXEC
    62 LD2FLAGS_ODINCRT = $(LD2FLAGS_ODINCRT) /EXEC
     58CTARGETFLAGS     = -Ge+
     59CXXTARGETFLAGS   = -Ge+
     60!else
     61CTARGETFLAGS     = -Ge-
     62CXXTARGETFLAGS   = -Ge-
    6363!endif
     64CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn+ $(CTARGETFLAGS)
     65CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn+ $(CXXTARGETFLAGS) /Gx+
     66CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn- $(CXXTARGETFLAGS) /Gx+
     67CFLAGS_WIN32APP  = -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn+ $(CTARGETFLAGS)
     68CXXFLAGS_WIN32APP= -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn+ $(CXXTARGETFLAGS)
     69CINCLUDES        = -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE)
     70CDEFINES         = -D__WIN32OS2__ -D__WINE__ -D__i386__ -DTCPV40HDRS -DCOMCTL32UNDOC
     71CDEFINES_ODINCRT = -D__WIN32OS2__ -D__WINE__ -D__i386__
     72CDEFINES_WIN32APP= -D__WIN32OS2__ -D__i386__
     73
     74
     75#
     76# Linker flags.
     77#   This may look a bit like a mess but, there is usually a reason behind
     78#   every line and the way it is done. We have some problems with nmake
     79#   when we add new flags to for example LD2FLAGS too many times.
     80#
     81!ifdef EXETARGET
     82LDTARGETFLAGS    = -Ge+
     83LD2TARGETFLAGS   = /EXEC
     84!else
     85LDTARGETFLAGS    = -Ge-
     86LD2TARGETFLAGS   = /DLL
     87!endif
     88LDFLAGS          = -Q   /B"/noe /map /packcode /packdata /exepack:2 /nodebug /nod" $(LDTARGETFLAGS) -Si -G5 -O+ -W3 -Gm+
     89LDFLAGS_ODINCRT  = -Q   /B"/noe /map /packcode /packdata /exepack:2 /nodebug"      $(LDTARGETFLAGS) -Si -G5 -O+ -W3 -Gm+
     90LD2FLAGS         = /nologo /noe /map /packcode /packdata /exepack:2 /nodebug /nod $(LD2TARGETFLAGS)
     91LD2FLAGS_ODINCRT = /nologo /noe /map /packcode /packdata /exepack:2 /nodebug      $(LD2TARGETFLAGS)
     92

  • trunk/include/pdwin32.vac36.dbg

    r4620 r4636  
    1 # $Id: pdwin32.vac36.dbg,v 1.22 2000-11-19 08:31:21 bird Exp $
     1# $Id: pdwin32.vac36.dbg,v 1.23 2000-11-19 23:53:47 bird Exp $
    22# ODIN / win32os2 Project
    33#
    … …  
    77#
    88
     9
     10#
     11# Library macros.
     12#
    913SOMLIB   = somtk.lib
    1014RTLLIB   = cpprms36.lib
    1115RTLLIB_O = cpprmo36.lib
    1216DLLENTRY = $(PDWIN32_LIB)\dllentry.obj
     17ODINCRT  = odincrtd
    1318
     19
     20#
     21# Object directory.
     22#
    1423OBJDIR   = .\bin\debug.vac36
    1524
    … …  
    2837OS2RC  = rc
    2938
    30 ODINCRT = odincrtd
    3139
    3240#
    3341# Tool Flags
    3442#
    35 CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+
    36 CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ /Gx+
    37 CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- /Gx+
    38 CFLAGS_WIN32APP  = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+
    39 CXXFLAGS_WIN32APP= -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+
    40 
    41 CINCLUDES        = -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE)
    42 CDEFINES         = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__ -DTCPV40HDRS -DCOMCTL32UNDOC
    43 CDEFINES_ODINCRT = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__
    44 CDEFINES_WIN32APP= -DDEBUG -D__WIN32OS2__ -D__i386__
    45 
    46 !ifdef DEBUGALL
    47 CFLAGS           = $(CFLAGS) -DDEBUG_ENABLELOG_LEVEL2
    48 CXXFLAGS         = $(CXXFLAGS) -DDEBUG_ENABLELOG_LEVEL2
    49 !endif
    50 
    5143ASFLAGS          = -Mb -Sc -Sv:ALP +Od -D:DEBUG
    52 LDFLAGS          = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /NOD /dbgpack /packcode /packdata /exepack:2"
    53 LDFLAGS_ODINCRT  = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /dbgpack /packcode /packdata /exepack:2"
    54 LD2FLAGS         = /nologo /DE /noe /map /NOD /dbgpack /packcode /packdata /exepack:2
    55 LD2FLAGS_ODINCRT = /nologo /DE /noe /map /dbgpack /packcode /packdata /exepack:2
    5644IMPLIBFLAGS      = /nologo
    5745ILIBFLAGS        = /nofree /quiet /nologo
    … …  
    6048OS2RCLFLAGS      = -x2 -n
    6149
     50
     51#
     52# C Compiler flags.
     53#   This may look a bit like a mess but, there is usually a reason behind
     54#   every line and the way it is done. We have some problems with nmake
     55#   when we add new flags to for example CXXFLAGS too many times.
     56#
     57!ifdef EXETARGET
     58CTARGETFLAGS     = -Ge+
     59CXXTARGETFLAGS   = -Ge+
     60!else
     61CTARGETFLAGS     = -Ge-
     62CXXTARGETFLAGS   = -Ge-
     63!endif
     64CFLAGS           = -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(CTARGETFLAGS)
     65CXXFLAGS         = -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(CXXTARGETFLAGS) /Gx+
     66CXXFLAGS_ODINCRT = -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn- $(CXXTARGETFLAGS) /Gx+
     67CFLAGS_WIN32APP  = -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(CTARGETFLAGS)
     68CXXFLAGS_WIN32APP= -Q -Si -Ti -Tm+ -Ss+ -W3 -Gm+ /Gn+ $(CXXTARGETFLAGS)
     69CINCLUDES        = -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE)
     70CDEFINES_WIN32APP= -DDEBUG -D__WIN32OS2__ -D__i386__
     71CDEFINES_ODINCRT = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__
     72CDEFINES         = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__ -DTCPV40HDRS -DCOMCTL32UNDOC \
     73!ifdef DEBUGALL
     74                   -DDEBUG_ENABLELOG_LEVEL2 \
     75!endif
    6276!ifdef NODEBUGINFO
    63 LDFLAGS          = $(LDFLAGS) /B"/nodebug /nodbgpack"
    64 LDFLAGS_ODINCRT  = $(LDFLAGS_ODINCRT) /B"/nodebug /nodbgpack"
    65 LD2FLAGS         = $(LD2FLAGS) /nodebug /nodbgpack
    66 LD2FLAGS_ODINCRT = $(LD2FLAGS_ODINCRT) /nodebug  /nodbgpack
    67 CFLAGS           = $(CFLAGS) -DDEFAULT_LOGGING_OFF
    68 CXXFLAGS         = $(CXXFLAGS) -DDEFAULT_LOGGING_OFF
     77                   -DDEFAULT_LOGGING_OFF
    6978!endif
    7079
     80
     81#
     82# Linker flags.
     83#   This may look a bit like a mess but, there is usually a reason behind
     84#   every line and the way it is done. We have some problems with nmake
     85#   when we add new flags to for example LD2FLAGS too many times.
     86#
    7187!ifdef EXETARGET
    72 CFLAGS           = $(CFLAGS) -Ge+ -Gn-
    73 CXXFLAGS         = $(CXXFLAGS) -Ge+ -Gn-
    74 LDFLAGS          = $(LDFLAGS) -Ge+
    75 LDFLAGS_ODINCRT  = $(LDFLAGS_ODINCRT) -Ge+
    76 LD2FLAGS         = $(LD2FLAGS) /EXEC
    77 LD2FLAGS_ODINCRT = $(LD2FLAGS_ODINCRT) /EXEC
     88LDTARGETFLAGS    = -Ge+
     89LD2TARGETFLAGS   = /EXEC
     90!else
     91LDTARGETFLAGS    = -Ge-
     92LD2TARGETFLAGS   = /DLL
    7893!endif
     94!ifdef NODEBUGINFO
     95LDFLAGS          = -Q   /B"/noe /map /packcode /packdata /exepack:2 /nodebug /nodbgpack /nod" -Si -W3 -Gm+ $(LDTARGETFLAGS)
     96LDFLAGS_ODINCRT  = -Q   /B"/noe /map /packcode /packdata /exepack:2 /nodebug /nodbgpack"      -Si -W3 -Gm+ $(LDTARGETFLAGS)
     97LD2FLAGS         = /nologo /noe /map /packcode /packdata /exepack:2 /nodebug /nodbgpack /nod $(LD2TARGETFLAGS)
     98LD2FLAGS_ODINCRT = /nologo /noe /map /packcode /packdata /exepack:2 /nodebug /nodbgpack      $(LD2TARGETFLAGS)
     99!else
     100LDFLAGS          = -Q   /B"/noe /map /packcode /packdata /exepack:2 /dbgpack /nod" -Ti -Si -W3 -Gm+ $(LDTARGETFLAGS)
     101LDFLAGS_ODINCRT  = -Q   /B"/noe /map /packcode /packdata /exepack:2 /dbgpack "     -Ti -Si -W3 -Gm+ $(LDTARGETFLAGS)
     102LD2FLAGS         = /nologo /noe /map /packcode /packdata /exepack:2 /dbgpack /nod /debug $(LD2TARGETFLAGS)
     103LD2FLAGS_ODINCRT = /nologo /noe /map /packcode /packdata /exepack:2 /dbgpack      /debug $(LD2TARGETFLAGS)
     104

  • trunk/include/pdwin32.vac36.post

    r4620 r4636  
    1 # $Id: pdwin32.vac36.post,v 1.4 2000-11-19 08:31:21 bird Exp $
     1# $Id: pdwin32.vac36.post,v 1.5 2000-11-19 23:53:47 bird Exp $
    22#
    33# Odin32 API
    … …  
    77# If ORGTARGET is defined it is used to generate the importlibrary.
    88#
    9 # Define NOTEXPDEF to remove the $(TARGET).lib and $(TARGET)exp.def rules.
    10 # Define EXETARGET to make an executable. (This also applies to pdwin32.mk.)
    11 # Define LIBTARGET to make an internal library.
    12 # Define LOCALCLEAN if only the local directory is to be clean.
    13 # Define CLEAN2 to invoke a second clean rule named 'clean2'.
    14 # Define NOCLEAN to exclude the clean rule. (Remember to make your own!)
    15 #
    16 # New style: (!defined OLD_STYLE)
    17 # Define NO_ALL_RULE to not make default all rule.
    18 # Define NO_LIB_RULE to not make default lib rule.
    19 # Define NO_MAIN_RULE to not make default main target rule.
    20 # Define NO_LNKFILE_RULE to not make default link-file rule.
    21 # Define NO_DEP_RULE to not make dependencies rule.
    22 # Define NO_CLEAN_RULE to not make clean rule (same as NOCLEAN - use this!).
    23 # Define NO_INTERNAL_LIBS to not include libs rule for subdirectories.
    24 # Define NO_MAIN_BIN_COPY to not copy the target and sym file to the main
    25 #    binary directory. It is only copied to the compiler specific directory.
    26 #    Main bin is /bin. Compiler specific bin is /bin/debug, /bin/debug.vac36, etc.
    27 # Define ADDITIONAL_DEP to add dependencies rules.
    28 #
    29 # Define MAKEFILE if the name of the makefile isn't "makefile".
    30 # Define DEFFILE to specify another file than $(TARGET).def or $(ORGTARGET).def.
    31 #    Define this if your .exe file have a .def file.
    32 # Define OS2RES as the names of the OS/2 .res file to create and link
    33 #    with the target .dll or .exe.
    34 # Define LIBS as a list of all the libraries to link
    35 #    with the target .dll or .exe.
    36 # Define SUBDIRS when you have subdirectories which should be made.
    37 #    dep and lib supports this fully. The rule libs are added, since we assume you
    38 #    makes internal libraries in the subdirectories. The libs rule is one of the
    39 #    dependencies of the main target.
    40 #
    41 
    42 !ifndef TARGET_EXTENSION
    43 !   ifdef EXETARGET
    44 TARGET_EXTENSION=exe
    45 !   else
    46 !       ifdef LIBTARGET
    47 TARGET_EXTENSION=lib
    48 !       else
    49 TARGET_EXTENSION=dll
    50 !       endif
    51 !   endif
    52 !endif
    53 
    54 
    55 !ifndef OLD_STYLE
    56 
    57 # Set default MAKEFILE if needed
    58 !ifndef MAKEFILE
    59 MAKEFILE = makefile
    60 !endif
    61 
    62 # Set default ORGTARGET if needed.
    63 !ifndef ORGTARGET
    64 ORGTARGET=$(TARGET)
    65 !endif
    66 
    67 # Set default DEFFILE if needed. (Currently for dlls only.)
    68 !ifndef DEFFILE
    69 !   ifndef EXETARGET
    70 DEFFILE = $(ORGTARGET).def
    71 !   endif
    72 !endif
    73 
    74 # Set INTLIBS (interal) if SUBDIRS is defined and NO_INTERNAL_LIBS is undefined.
    75 !ifdef SUBDIRS
    76 !   ifndef NO_INTERNAL_LIBS
    77 !       ifndef LIBTARGET
    78 INTLIBS = libs
    79 !       else
    80 INTLIBS = libs_sub
    81 !       endif
    82 !   endif
    83 !endif
    84 
    85 
    86 !ifndef LIBTARGET
    87 !ifndef EXETARGET
    88 ###############################################################################
    89 # DLL Target
    90 ###############################################################################
    919
    9210#
    93 # Dll: All rule - build objs, target dll, copies target to bin and makes libs.
     11# This is currently identical to VAC3.
    9412#
    95 !ifndef NO_ALL_RULE
    96 all:    $(OBJDIR) \
    97         $(INTLIBS) \
    98         $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) \
    99         $(OBJDIR)\$(TARGET).sym \
    100         $(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) \
    101         $(PDWIN32_BIN)\$(TARGET).sym \
    102         lib
    103 !endif
    104 
    105 
    106 #
    107 # Dll: Lib rule - build importlibrary (and evt. other libs)
    108 #
    109 !ifndef NO_LIB_RULE
    110 lib:    $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
    111 !endif
    112 
    113 
    114 #
    115 # Dll: Main target rule - builds the target dll.
    116 #
    117 !ifndef NO_MAIN_RULE
    118 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
    119     -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    120 !ifdef OS2RES
    121     $(OS2RC) $(OS2RCLFLAGS) $(OS2RES) $@
    122 !endif
    123 !endif
    124 
    125 
    126 #
    127 # Dll: Linker file - creates the parameter file passed on to the linker.
    128 #
    129 !ifndef NO_LNKFILE_RULE
    130 $(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
    131     @echo Creating file <<$@
    132 /OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    133 /MAP:$(OBJDIR)\$(TARGET).map
    134 $(OBJS)
    135 $(LIBS)
    136 $(DEFFILE)
    137 <<keep
    138 !endif
    139 
    140 
    141 !else # !ifndef EXETARGET
    142 ###############################################################################
    143 # EXE Target
    144 ###############################################################################
    145 
    146 #
    147 # Exe: All rule - build objs, target exe, copies target to bin.
    148 #
    149 !ifndef NO_ALL_RULE
    150 all:    $(OBJDIR) \
    151         $(INTLIBS) \
    152         $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION) \
    153         $(OBJDIR)\$(TARGET).sym \
    154         $(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) \
    155         $(PDWIN32_BIN)\$(TARGET).sym
    156 !endif
    157 
    158 
    159 #
    160 # Exe: Lib rule - dummy rule
    161 #
    162 !ifndef NO_LIB_RULE
    163 lib:
    164 !endif
    165 
    166 
    167 #
    168 # Exe: Main target rule - builds the target exe.
    169 #
    170 !ifndef NO_MAIN_RULE
    171 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\$(TARGET).lrf
    172     -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    173 !ifdef OS2RES
    174     $(OS2RC) $(OS2RCLFLAGS) $(OS2RES) $@
    175 !endif
    176 !endif
    177 
    178 
    179 #
    180 # Exe: Linker file - creates the parameter file passed on to the linker.
    181 #
    182 !ifndef NO_LNKFILE_RULE
    183 $(OBJDIR)\$(TARGET).lrf: $(MAKEFILE)
    184     @echo Creating file <<$@
    185 /OUT:$(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    186 /MAP:$(OBJDIR)\$(TARGET).map
    187 $(OBJS)
    188 $(LIBS) $(DEFFILE)
    189 <<keep
    190 !endif
    191 
    192 
    193 !endif # !ifndef EXETARGET !else
    194 !else # !ifndef LIBTARGET
    195 ###############################################################################
    196 # LIB target (internal object library)
    197 ###############################################################################
    198 
    199 #
    200 # Localcleanup is default for internal object libraries.
    201 #
    202 LOCALCLEAN = 1
    203 
    204 
    205 #
    206 # Lib: All rule - build objs and target library.
    207 #
    208 !ifndef NO_ALL_RULE
    209 all:    $(OBJDIR) \
    210         $(INTLIBS) \
    211         $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    212 !endif
    213 
    214 
    215 #
    216 # Lib: Lib rule - dummy rule
    217 #
    218 !ifndef NO_LIB_RULE
    219 lib:
    220 !endif
    221 
    222 
    223 #
    224 # Lib: Internal library rule. Same as the all rule.
    225 #
    226 !ifndef NO_INTERNAL_LIBS
    227 libs: all
    228 !endif
    229 
    230 
    231 #
    232 # Lib: Main target rule - builds the target internal library.
    233 #
    234 !ifndef NO_MAIN_RULE
    235 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS)
    236     $(RM) $@
    237     $(ILIB) $(ILIBFLAGS) $@ @<<
    238 $(OBJS:  = &^
    239 )
    240 $(OBJDIR)\$(@B).lst
    241 <<
    242 !endif
    243 
    244 
    245 !endif # !ifndef LIBTARGET
    246 
    247 
    248 ###############################################################################
    249 # Common rules for both exe and dll, new style
    250 ###############################################################################
    251 
    252 #
    253 # Common (new): Dep rule - makes depenencies for C, C++ and Asm files.
    254 #
    255 !ifndef NO_DEP_RULE
    256 dep: dep_internal $(ADDITIONAL_DEP)
    257 dep_internal:
    258     $(DEPEND) $(CINCLUDES) *.c *.cpp *.h *.asm *.inc \
    259         *.rc *.dlg $(PDWIN32_INCLUDE)\*.h -robj *.orc
    260 !ifdef SUBDIRS
    261     $(DODIRS) "$(SUBDIRS)"  $(MAKE_CMD) dep
    262 !endif
    263 !endif
    264 
    265 
    266 #
    267 # Common: Internal library rule. Make libraries in subdirectories.
    268 #   For makefiles with subdirectories is common to have make libraries in subdirectories.
    269 #
    270 !ifndef NO_INTERNAL_LIBS
    271 !ifdef INTLIBS
    272 $(INTLIBS):
    273     $(DODIRS) "$(SUBDIRS)"  $(MAKE_CMD) libs
    274 !endif
    275 !endif
    276 
    277 !endif # OLD_STYLE
    278 
    279 ###############################################################################
    280 # Common rules for both exe and dll, old and new style.
    281 ###############################################################################
    282 
    283 #
    284 # Common: Copy library rule.
    285 #
    286 $(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
    287     $(CP) $** $@
    288 
    289 
    290 #
    291 # Common: Copy dll/exe rule.
    292 #
    293 $(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION): $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION)
    294     $(CP) $** $@
    295 !ifndef NO_MAIN_BIN_COPY
    296     -$(CP) $** $(@D)..\..\$(@F)
    297 !endif
    298 
    299 
    300 #
    301 # Common: Copy sym rule.
    302 #
    303 $(PDWIN32_BIN)\$(TARGET).sym: $(OBJDIR)\$(TARGET).sym
    304     $(CP) $** $@
    305 !ifndef NO_MAIN_BIN_COPY
    306     -$(CP) $** $(@D)..\..\$(@F)
    307 !endif
    308 
    309 
    310 #
    311 # Common: Make sym file rule.
    312 #
    313 $(OBJDIR)\$(TARGET).sym: $(OBJDIR)\$(TARGET).map
    314     cd $(OBJDIR)
    315     $(MAPSYM) $(TARGET).map
    316     cd ..\..
    317 
    318 
    319 #
    320 # Common: Make library from the <>exp.def or the <>.def file.
    321 #
    322 !ifndef NOTEXPDEF
    323 $(ORGTARGET).lib: $(ORGTARGET)exp.def
    324     $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    325 !else
    326 $(TARGET).lib: $(DEFFILE)
    327     $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    328 !endif
    329 
    330 
    331 #
    332 # Common: Make the <>exp.def file.
    333 #
    334 !ifndef NOTEXPDEF
    335 $(ORGTARGET)exp.def: $(DEFFILE)
    336     $(IMPDEF) $** $@
    337 !endif
    338 
    339 
    340 #
    341 # Common: Create the object directory.
    342 #
    343 $(OBJDIR):
    344     @if not exist bin $(MKDIR) bin
    345     @if not exist $(OBJDIR) $(MKDIR) $(OBJDIR)
    346 
    347 
    348 #
    349 # Common: General clean rule. To clean more add it to CLEANEXTRAS!
    350 #
    351 !ifndef NOCLEAN
    352 !ifndef CLEAN2
    353 clean:
    354 !else
    355 clean:  clean2
    356 !endif
    357     $(RM) *.lib *.res *.map *.pch \
    358 !if "$(OBJDIR)" != ""
    359      $(OBJDIR)\* \
    360 !endif
    361 !ifndef LOCALCLEAN
    362         $(PDWIN32_LIB)\$(ORGTARGET).lib \
    363         $(ORGTARGET)exp.def \
    364         $(PDWIN32_BIN)\$(TARGET).$(TARGET_EXTENSION) *.$(TARGET_EXTENSION) \
    365         $(PDWIN32_BIN)\$(TARGET).sym *.sym \
    366         $(CLEANEXTRAS)
    367 !else
    368         $(CLEANEXTRAS)
    369 !endif
    370 !endif
    371 !ifdef SUBDIRS
    372     $(DODIRS) "$(SUBDIRS)"  $(MAKE_CMD) clean
    373 !endif
    374 
    375 
    376 #
    377 # Common: Include the .depend file.
    378 #   If the depend file don't exists we'll complain about it.
    379 #
    380 !ifndef NODEP
    381 !   if [$(EXISTS) .depend] == 0
    382 !       include .depend
    383 !   else
    384 !       if [$(ECHO) .depend doesn't exist]
    385 !       endif
    386 !   endif
    387 !endif
    388 
     13!include $(PDWIN32_INCLUDE)/pdwin32.vac3.post

  • trunk/include/pdwin32.vac36.rel

    r4620 r4636  
    1 # $Id: pdwin32.vac36.rel,v 1.20 2000-11-19 08:31:21 bird Exp $
     1# $Id: pdwin32.vac36.rel,v 1.21 2000-11-19 23:53:47 bird Exp $
    22# ODIN / win32os2 Project
    33#
    … …  
    77#
    88
     9
     10#
     11# Library macros.
     12#
    913SOMLIB   = somtk.lib
    1014RTLLIB   = cpprms36.lib
    1115RTLLIB_O = cpprmo36.lib
    1216DLLENTRY = $(PDWIN32_LIB)\dllentry.obj
     17ODINCRT  = odincrt
    1318
     19
     20#
     21# Object directory.
     22#
    1423OBJDIR   = .\bin\release.vac36
     24
    1525
    1626#
    … …  
    2737OS2RC  = rc
    2838
    29 ODINCRT = odincrt
    3039
    3140#
    3241# Tool Flags
    3342#
    34 CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+
    35 CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ /Gx+
    36 CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- /Gx+
    37 CFLAGS_WIN32APP  = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+
    38 CXXFLAGS_WIN32APP= -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+
    39 
    40 CINCLUDES        = -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE)
    41 CDEFINES         = -D__WIN32OS2__ -D__WINE__ -D__i386__ -DTCPV40HDRS -DCOMCTL32UNDOC
    42 CDEFINES_ODINCRT = -D__WIN32OS2__ -D__WINE__ -D__i386__
    43 CDEFINES_WIN32APP= -D__WIN32OS2__ -D__i386__
    44 
    4543ASFLAGS          = -Mb -Sc -Sv:ALP
    46 LDFLAGS          = -Q -Si -G5 -O+ -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /packcode /packdata /exepack:2 /nod"
    47 LDFLAGS_ODINCRT  = -Q -Si -G5 -O+ -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /packcode /packdata /exepack:2"
    48 LD2FLAGS         = /nologo /noe /map /packcode /packdata /exepack:2 /nod /nodebug
    49 LD2FLAGS_ODINCRT = /nologo /noe /map /packcode /packdata /exepack:2 /nodebug
    5044IMPLIBFLAGS      = /nologo
    5145ILIBFLAGS        = /nofree /quiet /nologo
    … …  
    5448OS2RCLFLAGS      = -x2 -n
    5549
     50#
     51# C Compiler flags.
     52#   This may look a bit like a mess but, there is usually a reason behind
     53#   every line and the way it is done. We have some problems with nmake
     54#   when we add new flags to for example CXXFLAGS too many times.
     55#
    5656!ifdef EXETARGET
    57 CFLAGS           = $(CFLAGS) -Ge+ -Gn-
    58 CXXFLAGS         = $(CXXFLAGS) -Ge+ -Gn-
    59 LDFLAGS          = $(LDFLAGS) -Ge+
    60 LDFLAGS_ODINCRT  = $(LDFLAGS_ODINCRT) -Ge+
    61 LD2FLAGS         = $(LD2FLAGS) /EXEC
    62 LD2FLAGS_ODINCRT = $(LD2FLAGS_ODINCRT) /EXEC
     57CTARGETFLAGS     = -Ge+
     58CXXTARGETFLAGS   = -Ge+
     59!else
     60CTARGETFLAGS     = -Ge-
     61CXXTARGETFLAGS   = -Ge-
    6362!endif
     63CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn+ $(CTARGETFLAGS)
     64CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn+ $(CXXTARGETFLAGS) /Gx+
     65CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn- $(CXXTARGETFLAGS) /Gx+
     66CFLAGS_WIN32APP  = -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn+ $(CTARGETFLAGS)
     67CXXFLAGS_WIN32APP= -Q -Si -G5 -O+ -Oi+ -Ss+ -W3 -Gm+ /Gn+ $(CXXTARGETFLAGS)
     68CINCLUDES        = -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE)
     69CDEFINES         = -D__WIN32OS2__ -D__WINE__ -D__i386__ -DTCPV40HDRS -DCOMCTL32UNDOC
     70CDEFINES_ODINCRT = -D__WIN32OS2__ -D__WINE__ -D__i386__
     71CDEFINES_WIN32APP= -D__WIN32OS2__ -D__i386__
     72
     73
     74#
     75# Linker flags.
     76#   This may look a bit like a mess but, there is usually a reason behind
     77#   every line and the way it is done. We have some problems with nmake
     78#   when we add new flags to for example LD2FLAGS too many times.
     79#
     80!ifdef EXETARGET
     81LDTARGETFLAGS    = -Ge+
     82LD2TARGETFLAGS   = /EXEC
     83!else
     84LDTARGETFLAGS    = -Ge-
     85LD2TARGETFLAGS   = /DLL
     86!endif
     87LDFLAGS          = -Q   /B"/noe /map /packcode /packdata /exepack:2 /nodebug /nod" $(LDTARGETFLAGS) -Si -G5 -O+ -W3 -Gm+
     88LDFLAGS_ODINCRT  = -Q   /B"/noe /map /packcode /packdata /exepack:2 /nodebug"      $(LDTARGETFLAGS) -Si -G5 -O+ -W3 -Gm+
     89LD2FLAGS         = /nologo /noe /map /packcode /packdata /exepack:2 /nodebug /nod $(LD2TARGETFLAGS)
     90LD2FLAGS_ODINCRT = /nologo /noe /map /packcode /packdata /exepack:2 /nodebug      $(LD2TARGETFLAGS)
     91
Note: See TracChangeset for help on using the changeset viewer.