Changeset 4334 for trunk/include


Ignore:
Timestamp:
Sep 28, 2000, 5:16:25 AM (25 years ago)
Author:
bird
Message:

Support for new makefile style.
Changed watcom. Nows uses UNIX compatible mode rather than M$.

Location:
trunk/include
Files:
4 added
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/pdwin32.mk

    r3032 r4334  
    1 # $Id: pdwin32.mk,v 1.8 2000-03-06 23:42:11 bird Exp $
     1# $Id: pdwin32.mk,v 1.9 2000-09-28 03:16:23 bird Exp $
    22#
    33# PD-Win32 Project
     
    1212#    DEBUG - build a debug version instead of release version
    1313#    CCENV:
    14 #      VAC3 - use IBM VisualAge for C++ 3 compiler environment (default)
    15 #      EMX - use GNU/EMX compiler environment
     14#      VAC3  - use IBM VisualAge for C++ 3 compiler environment (default).
     15#      VAC36 - use IBM VisualAge for C++ 3.6.5 compiler environment.
     16#      WAT   - use Watcom C/C++ v11.x compiler environment.
     17#      EMX   - use GNU/EMX compiler environment.
    1618#
    1719
     20
    1821# include compiler environment
    19 !ifndef CCENV
     22!ifndef __VERSION__
     23!   ifndef CCENV
    2024CCENV=VAC3
    2125VAC3=1
    22 !else
    23 !if "$(CCENV)" == "VAC36"
     26!   else
     27!       if "$(CCENV)" == "VAC36"
    2428CCENV=VAC36
    2529VAC36=1
    26 !endif
     30!       else
     31
     32!       endif
     33!   endif
     34!else
     35# (wmake and Watcom)
     36CCENV=WAT
     37WAT=1
     38!   if "$(%DEBUG)" != ""
     39DEBUG=1
     40!   endif
    2741!endif
    2842
     43
     44# Set default directory paths if not set.
     45!ifndef PDWIN32_INCLUDE
     46PDWIN32_INCLUDE = ..\..\include
     47!endif
     48!ifndef PDWIN32_BIN
     49PDWIN32_BIN     = ..\..\$(OBJDIR)
     50!endif
     51!ifndef PDWIN32_LIB
     52PDWIN32_LIB     = ..\..\lib
     53!endif
     54!ifndef PDWIN32_TOOLS
     55PDWIN32_TOOLS   = ..\..\tools\bin
     56!endif
     57
     58
     59# Include compiler environment.
    2960!ifdef DEBUG
    3061!include $(PDWIN32_INCLUDE)/pdwin32.$(CCENV).dbg
     
    3364!endif
    3465
    35 # include system tools
     66
     67# Include system tools
    3668!include $(PDWIN32_INCLUDE)/pdwin32.tools
    3769
  • trunk/include/pdwin32.post

    r4288 r4334  
    1 # $Id: pdwin32.post,v 1.11 2000-09-21 11:17:28 bird Exp $
     1# $Id: pdwin32.post,v 1.12 2000-09-28 03:16:23 bird Exp $
    22#
    33# Odin32 API
     
    1313# Define NOCLEAN to exclude the clean rule. (Remember to make your own!)
    1414#
     15# New style: (define NEW_STYLE)
     16# Define NO_ALL_RULE to not make default all rule.
     17# Define NO_LIB_RULE to not make default lib rule.
     18# Define NO_DLL_RULE to not make default dll rule.
     19# Define NO_EXE_RULE to not make default exe 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#
    1524
     25# Include compiler spesific post rule file.
     26!include $(PDWIN32_INCLUDE)/pdwin32.$(CCENV).post
    1627
    17 # Copy library rule.
    18 !ifndef ORGTARGET
    19 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    20 !else
    21 $(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
    22 !endif
    23     $(CP) $** $@
    24 
    25 
    26 # Copy dll rule.
    27 !ifndef EXETARGET
    28 $(PDWIN32_BIN)\$(TARGET).dll: $(OBJDIR)\$(TARGET).dll
    29 !else
    30 $(PDWIN32_BIN)\$(TARGET).exe: $(OBJDIR)\$(TARGET).exe
    31 !endif
    32     cd $(OBJDIR)
    33     $(MAPSYM) $(TARGET).map
    34     cd ..\..
    35     $(CP) $(OBJDIR)\$(TARGET).sym $(PDWIN32_BIN)
    36     $(CP) $** $@
    37     $(CP) $** $(@D)..\..\$(@F)
    38     $(CP) $(OBJDIR)\$(TARGET).sym $(@D)..\..
    39 
    40 
    41 !ifndef NOTEXPDEF
    42 # make library from the <>exp.def file.
    43 !ifndef ORGTARGET
    44 $(TARGET).LIB: $(TARGET)exp.def
    45 !else
    46 $(ORGTARGET).LIB: $(ORGTARGET)exp.def
    47 !endif
    48     $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    49     $(CP) $@ $(PDWIN32_LIB)
    50 
    51 
    52 # make the <>exp.def file.
    53 !ifndef ORGTARGET
    54 $(TARGET)exp.def: $(TARGET).def
    55 !else
    56 $(ORGTARGET)exp.def: $(ORGTARGET).def
    57 !endif
    58     $(IMPDEF) $** $@
    59 !endif
    60 
    61 
    62 # Create the object directory.
    63 $(OBJDIR):
    64     @if not exist bin $(MKDIR) bin
    65     @if not exist $(OBJDIR) $(MKDIR) $(OBJDIR)
    66 
    67 
    68 #
    69 # General clean rule. To clean more add it to CLEANEXTRAS!
    70 #
    71 !ifndef NOCLEAN
    72 !ifndef CLEAN2
    73 clean:
    74 !else
    75 clean:  clean2
    76 !endif
    77     $(RM) *.LIB *.res *.map *.pch \
    78 !if "$(OBJDIR)" != ""
    79      $(OBJDIR)\* \
    80 !endif
    81 !ifndef LOCALCLEAN
    82         $(PDWIN32_LIB)\$(TARGET).LIB \
    83 !ifndef EXETARGET
    84         $(PDWIN32_BIN)\$(TARGET).dll $(TARGET)exp.def *.dll \
    85 !else
    86         $(PDWIN32_BIN)\$(TARGET).exe *.exe \
    87 !endif
    88         $(CLEANEXTRAS)
    89 !else
    90         $(CLEANEXTRAS)
    91 !endif
    92 !endif
    93 
    94 
    95 #
    96 # Include the .depend file.
    97 #   If the depend file don't exists we'll complain about it.
    98 #
    99 !ifndef NODEP
    100 !   if [$(EXISTS) .depend] == 0
    101 !       include .depend
    102 !   else
    103 !       if [$(ECHO) .depend doesn't exist]
    104 !       endif
    105 !   endif
    106 !endif
  • trunk/include/pdwin32.tools

    r3480 r4334  
    1 # $Id: pdwin32.tools,v 1.13 2000-05-02 20:49:27 sandervl Exp $
     1# $Id: pdwin32.tools,v 1.14 2000-09-28 03:16:23 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    77# phaller@gmx.net, 1999/05/27
    88#
     9
     10# Check that CCENV is set; set defaults if not set.
     11!ifndef CCENV
     12!   ifndef __VERSION__
     13CCENV = VAC3
     14VAC3 = 1
     15!   else
     16CCENV = WAT
     17WAT = 1
     18!   endif
     19!endif
     20
     21# Check that PDWIN32_INCLUDE is set; set default if not set.
     22!ifndef PDWIN32_INCLUDE
     23PDWIN32_INCLUDE = ..\..\include
     24!endif
    925
    1026
     
    2642DEPEND      = $(PDWIN32_TOOLS)\fastdep.exe
    2743!endif
    28 MAKE_CMD    = nmake /nologo
    29 !ifdef DEBUG
    30 MAKE_CMD    = $(MAKE_CMD) DEBUG=1
    31 !endif
    32 !ifdef NODEBUGINFO
    33 MAKE_CMD    = $(MAKE_CMD) NODEBUGINFO=1
    34 !endif
    35 !ifdef NODEP
    36 MAKE_CMD    = $(MAKE_CMD) NODEP=1
    37 !endif
    3844
    3945
    40 #
    41 # Targets
    42 #
    43 .SUFFIXES: .orc
     46# Include compiler dependent tools
     47!include $(PDWIN32_INCLUDE)/pdwin32.$(CCENV).tools
    4448
    45 .c{$(OBJDIR)}.obj:
    46     $(CC) $(CFLAGS) -c -Fo$(OBJDIR)\$(@B).obj $<
    47 
    48 .cpp{$(OBJDIR)}.obj:
    49     $(CXX) $(CXXFLAGS) -Fo$(OBJDIR)\$(@B).obj -c $<
    50 
    51 .asm{$(OBJDIR)}.obj:
    52     $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $<
    53 
    54 .orc{$(OBJDIR)}.asm:
    55     $(RC) $(RCFLAGS) -o $(OBJDIR)\$(@B).asm $<
    56 
    57 .orc{$(OBJDIR)}.obj:
    58     $(RC) $(RCFLAGS) -o $(OBJDIR)\$(@B).asm $<
    59     $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $(OBJDIR)\$(@B).asm
    60 
    61 .rc{$(OBJDIR)}.res:
    62     $(OS2RC) $(OS2RCFLAGS) $< $@
    63 
    64 
    65 #
    66 # Old Targets
    67 #
    68 .c.obj:
    69     $(CC) $(CFLAGS) -c $<
    70 
    71 .cpp.obj:
    72     $(CXX) $(CXXFLAGS) -c $<
    73 
    74 .asm.obj:
    75     $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $<
    76 
    77 .orc.asm:
    78     $(RC) $(RCFLAGS) -o $@ $<
    79 
    80 .rc.res:
    81     $(OS2RC) $(OS2RCFLAGS) $< $@
    82 
  • trunk/include/pdwin32.vac3.dbg

    r4284 r4334  
    1 # $Id: pdwin32.vac3.dbg,v 1.28 2000-09-20 20:42:35 sandervl Exp $
     1# $Id: pdwin32.vac3.dbg,v 1.29 2000-09-28 03:16:23 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    1010RTLLIB   = cppom30.lib
    1111RTLLIB_O = cppom30o.lib
     12DLLENTRY = $(PDWIN32_LIB)\dllentry.obj
    1213
    1314OBJDIR   = .\bin\debug
  • trunk/include/pdwin32.vac3.rel

    r4284 r4334  
    1 # $Id: pdwin32.vac3.rel,v 1.27 2000-09-20 20:42:36 sandervl Exp $
     1# $Id: pdwin32.vac3.rel,v 1.28 2000-09-28 03:16:24 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    1010RTLLIB   = cppom30.lib
    1111RTLLIB_O = cppom30o.lib
     12DLLENTRY = $(PDWIN32_LIB)\dllentry.obj
    1213
    1314OBJDIR   = .\bin\release
  • trunk/include/pdwin32.vac36.dbg

    r4284 r4334  
    1 # $Id: pdwin32.vac36.dbg,v 1.19 2000-09-20 20:42:36 sandervl Exp $
     1# $Id: pdwin32.vac36.dbg,v 1.20 2000-09-28 03:16:24 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    1010RTLLIB   = cpprms36.lib
    1111RTLLIB_O = cpprmo36.lib
     12DLLENTRY = $(PDWIN32_LIB)\dllentry.obj
    1213
    13 OBJDIR   = .\bin\debug
     14OBJDIR   = .\bin\debug.vac36
     15
    1416
    1517#
  • trunk/include/pdwin32.vac36.rel

    r4284 r4334  
    1 # $Id: pdwin32.vac36.rel,v 1.18 2000-09-20 20:42:36 sandervl Exp $
     1# $Id: pdwin32.vac36.rel,v 1.19 2000-09-28 03:16:24 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    1010RTLLIB   = cpprms36.lib
    1111RTLLIB_O = cpprmo36.lib
     12DLLENTRY = $(PDWIN32_LIB)\dllentry.obj
    1213
    13 OBJDIR   = .\bin\release
     14OBJDIR   = .\bin\release.vac36
    1415
    1516#
  • trunk/include/pdwin32.wat.dbg

    r4144 r4334  
    1 # $Id: pdwin32.wat.dbg,v 1.3 2000-09-01 16:01:20 bird Exp $
     1# $Id: pdwin32.wat.dbg,v 1.4 2000-09-28 03:16:24 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    77
    88SOMLIB   = somtk.lib
    9 RTLLIB   = cppom30.lib
    10 RTLLIB_O = cppom30o.lib
     9RTLLIB   = clib3r.lib
     10RTLLIB_O = clib3r.lib
     11DLLENTRY = $(PDWIN32_LIB)\dllentry_watcom.obj
    1112
    12 OBJDIR   = .\bin\debug
     13OBJDIR   = .\bin\debug.wat
    1314
    1415#
     
    1920AS     = alp
    2021LD     = wlink
     22LD2    = $(LD)
    2123IMPLIB = implib
    2224ILIB   = ilib
     
    5254
    5355!ifdef DEBUGALL
    54 CFLAGS           = $(CFLAGS) -DDEBUG_ENABLELOG_LEVEL2
    55 CXXFLAGS         = $(CXXFLAGS) -DDEBUG_ENABLELOG_LEVEL2
     56CFLAGS           += -DDEBUG_ENABLELOG_LEVEL2
     57CXXFLAGS         += -DDEBUG_ENABLELOG_LEVEL2
    5658!endif
    5759
     60!ifdef EXETARGET
     61CFLAGS           += -bg
     62CXXFLAGS         += -bg
     63!else
     64CFLAGS           += -bd
     65CXXFLAGS         += -bd
     66!endif
    5867
    59 LDFLAGS          = option map, nodefaultlibs, maxe=25, q, symf
    60 LDFLAGS_ODINCRT  = option map, maxe=25, q, symf
     68!ifdef EXETARGET
     69LDFLAGS          = system os2v2 nodefaultlibs, maxe=25, q, symf
     70LDFLAGS_ODINCRT  = system os2v2 maxe=25, q, symf
     71!else
     72LDFLAGS          = system os2v2 dll initinstance terminstance option nodefaultlibs, maxe=25, q, symf
     73LDFLAGS_ODINCRT  = system os2v2 dll initinstance terminstance option                maxe=25, q, symf
     74!endif
    6175
    6276ASFLAGS          = -Mb -Sc -Sv:ALP +Od
     
    6882
    6983!ifndef NODEBUGINFO
    70 LDFLAGS          = $(LDFLAGS) d all
    71 LDFLAGS_ODINCRT  = $(LDFLAGS_ODINCRT) d all
     84LDFLAGS          += d all
     85LDFLAGS_ODINCRT  += d all
    7286!else
    73 CFLAGS           = $(CFLAGS) -DDEFAULT_LOGGING_OFF
    74 CXXFLAGS         = $(CXXFLAGS) -DDEFAULT_LOGGING_OFF
     87CFLAGS           += -DDEFAULT_LOGGING_OFF
     88CXXFLAGS         += -DDEFAULT_LOGGING_OFF
    7589!endif
    7690
    77 !ifdef EXETARGET
    78 CFLAGS           = $(CFLAGS) -bg
    79 CXXFLAGS         = $(CXXFLAGS) bg
    80 LDFLAGS          = system os2v2 $(LDFLAGS)
    81 LDFLAGS_ODINCRT  = system os2v2 $(LDFLAGS_ODINCRT)
    82 !else
    83 CFLAGS           = $(CFLAGS) -bd
    84 CXXFLAGS         = $(CXXFLAGS) -bd
    85 LDFLAGS          = system os2v2 dll initinstance terminstance $(LDFLAGS)
    86 LDFLAGS_ODINCRT  = system os2v2 dll initinstance terminstance $(LDFLAGS_ODINCRT)
    87 !endif
     91LD2FLAGS         = $(LDFLAGS)
     92LD2FLAGS_ODINCRT = $(LDFLAGS_ODINCRT)
     93
  • trunk/include/pdwin32.wat.post

    r4288 r4334  
    1 # $Id: pdwin32.wat.post,v 1.2 2000-09-21 11:17:28 bird Exp $
     1# $Id: pdwin32.wat.post,v 1.3 2000-09-28 03:16:24 bird Exp $
    22#
    33# Odin32 API
     
    1313# Define NOCLEAN to exclude the clean rule. (Remember to make your own!)
    1414#
     15# New style: (define NEW_STYLE)
     16# Define NO_ALL_RULE to not make default all rule.
     17# Define NO_LIB_RULE to not make default lib rule.
     18# Define NO_DLL_RULE to not make default dll rule.
     19# Define NO_EXE_RULE to not make default exe 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#
     24
     25
     26!ifdef NEW_STYLE
     27!ifndef EXETARGET
     28
     29
     30# All rule - build objs, target dll, copies target to bin and makes libs.
     31!ifndef NO_ALL_RULE
     32all:    $(OBJDIR) \
     33        $(OBJDIR)\$(TARGET).dll \
     34        $(PDWIN32_BIN)\$(TARGET).dll \
     35        lib
     36!endif
     37
     38
     39# Lib rule - build importlibrary (and evt. other libs)
     40!ifndef NO_LIB_RULE
     41lib:    $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
     42!endif
     43
     44
     45# Dll rule - builds the target dll.
     46!ifndef NO_DLL_RULE
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) @$(OBJDIR)\$(TARGET).lrf
     49!endif
     50
     51
     52# Linker file - creates the parameter file passed on to the linker.
     53!ifndef NO_LNKFILE_RULE
     54$(OBJDIR)\$(TARGET).lrf: makefile  $(PDWIN32_INCLUDE)\pdwin32.wat.post
     55    @$(RM) $@
     56    @echo Creating file <<$@
     57$(LD2FLAGS)
     58name $(OBJDIR)\$(TARGET).dll
     59option map=$(OBJDIR)\$(TARGET).map
     60file    {$(OBJS)}
     61library {$(LIBS)}
     62<<keep
     63# $(TARGET).def
     64# $(TARGET).map
     65!endif
     66
     67
     68# Dep rule - makes depenencies for C, C++ and Asm files.
     69!ifndef NO_DEP_RULE
     70dep:
     71    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
     72        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     73!endif
     74
     75!else # !ifndef EXETARGET
     76
     77
     78# All rule - build objs, target exe, copies target to bin.
     79!ifndef NO_ALL_RULE
     80all:    $(OBJDIR) \
     81        $(OBJDIR)\$(TARGET).exe \
     82        $(PDWIN32_BIN)\$(TARGET).exe
     83!endif
     84
     85
     86# Lib rule - dummy rule
     87!ifndef NO_LIB_RULE
     88lib:
     89!endif
     90
     91
     92# Exe rule - builds the target exe.
     93!ifndef NO_EXE_RULE
     94$(OBJDIR)\$(TARGET).exe: $(OBJSNOOBJDIR) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     95    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
     96!endif
     97
     98
     99# Linker file - creates the parameter file passed on to the linker.
     100!ifndef NO_LNKFILE_RULE
     101$(OBJDIR)\$(TARGET).lrf: makefile  $(PDWIN32_INCLUDE)\pdwin32.wat.post
     102    @echo Creating file <<$@
     103/OUT:$(OBJDIR)\$(TARGET).exe
     104/MAP:$(OBJDIR)\$(TARGET).map
     105$(OBJS)
     106$(LIBS)
     107$(TARGET).def
     108<<keep
     109!endif
     110
     111
     112# Dep rule - makes depenencies for C, C++ and Asm files.
     113!ifndef NO_DE_PRULE
     114dep:
     115    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
     116        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     117!endif
     118
     119
     120!endif # EXETARGET
     121!endif # NEW_STYLE
     122
     123
    15124
    16125
     
    35144    $(CP) $(OBJDIR)\$(TARGET).sym $(PDWIN32_BIN)
    36145    $(CP) $** $@
    37     $(CP) $** $(@D)..\..\$(@F)
    38     $(CP) $(OBJDIR)\$(TARGET).sym $(@D)..\..
     146    -$(CP) $** $(@D)..\..\$(@F)
     147    -$(CP) $(OBJDIR)\$(TARGET).sym $(@D)..\..
    39148
    40149
     
    70179#
    71180!ifndef NOCLEAN
     181!ifndef NO_CLEAN_RULE
    72182!ifndef CLEAN2
    73183clean: .SYMBOLIC
     
    75185clean:  clean2
    76186!endif
    77     $(RM) *.LIB *.res *.map *.pch \
     187    $(RM) *.LIB *.res *.map *.pch *.orc_asm \
    78188!if "$(OBJDIR)" != ""
    79189     $(OBJDIR)\* \
     
    91201!endif
    92202!endif
    93 
    94 
     203!endif
     204
     205
  • trunk/include/pdwin32.wat.rel

    r4114 r4334  
    1 # $Id: pdwin32.wat.rel,v 1.1 2000-08-29 21:39:01 sandervl Exp $
     1# $Id: pdwin32.wat.rel,v 1.2 2000-09-28 03:16:24 bird Exp $
    22# ODIN / win32os2 Project
    33#
    4 # DEBUG makefile for the Watcom C/C++ compiler environment
     4# RELEASE makefile for the Watcom C/C++ compiler environment.
    55#
    66#
    77
    88SOMLIB   = somtk.lib
    9 RTLLIB   = cppom30.lib
    10 RTLLIB_O = cppom30o.lib
     9RTLLIB   = clib3r.lib
     10RTLLIB_O = clib3r.lib
     11DLLENTRY = $(PDWIN32_LIB)\dllentry_watcom.obj
    1112
    12 OBJDIR   = .\bin\release
     13OBJDIR   = .\bin\release.wat
    1314
    1415#
     
    1920AS     = alp
    2021LD     = wlink
     22LD2    = $(LD)
    2123IMPLIB = implib
    2224ILIB   = ilib
     
    5254CXXFLAGS_WIN32APP= -w4 -wcd=726 -e25 -od -bm -mf -5r -bt=os2 -zq -fp5 -fpi87 -i$(%WATCOM)\h -i$(PDWIN32_INCLUDE)\Win -i. -i$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
    5355
    54 LDFLAGS          = option map, nodefaultlibs, maxe=25, q, symf
    55 LDFLAGS_ODINCRT  = option map, maxe=25, q, symf
     56LDFLAGS          = option nodefaultlibs, maxe=25, q, symf
     57LDFLAGS_ODINCRT  = option maxe=25, q, symf
    5658
    5759ASFLAGS          = -Mb -Sc -Sv:ALP +Od
     
    8082LDFLAGS_ODINCRT  += system os2v2 dll initinstance terminstance
    8183!endif
     84
     85LD2FLAGS         = $(LDFLAGS)
     86LD2FLAGS_ODINCRT = $(LDFLAGS_ODINCRT)
     87
  • trunk/include/pdwin32.wat.tools

    r4330 r4334  
    1 # $Id: pdwin32.wat.tools,v 1.3 2000-09-27 22:25:53 bird Exp $
     1# $Id: pdwin32.wat.tools,v 1.4 2000-09-28 03:16:25 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    88
    99#
    10 # System Utilites
     10# Make command definition.
    1111#
    12 RM          = rm -f
    13 CP          = copy
    14 MKDIR       = mkdir
    15 ECHO        = echo
    16 MAPSYM      = mapsym
    17 EXISTS      = $(PDWIN32_TOOLS)\Exists.cmd
    18 DOWITHDIRS  = $(PDWIN32_TOOLS)\dowithdirs.cmd
    19 IMPDEF      = $(PDWIN32_TOOLS)\impdef.exe
    20 DEPEND      = $(PDWIN32_TOOLS)\fastdep.exe -o$$(OBJDIR) -cy+
    21 
    22 MAKE_CMDLINE= wmake /ms
     12MAKE_CMDLINE= wmake -u
     13!if "$(%DEBUG)" != ""
     14DEBUG = 1
     15!endif
    2316!ifdef DEBUG
    2417MAKE_CMDLINE= $(MAKE_CMDLINE) DEBUG=1
    2518!endif
     19!if "$(%NODEBUGINFO)" != ""
     20NODEBUGINFO = 1
     21!endif
    2622!ifdef NODEBUGINFO
    2723MAKE_CMDLINE= $(MAKE_CMDLINE) NODEBUGINFO=1
     24!endif
     25!if "$(%NODEP)" != ""
     26NODEP = 1
    2827!endif
    2928!ifdef NODEP
     
    3736#
    3837.ERASE
    39 .SUFFIXES:
    40 .SUFFIXES: .lst .res .obj .asm .orc .cpp .c .rc
     38.EXTENSIONS:
     39.EXTENSIONS: .lst .res .obj .orc_asm .orc .cpp .c .rc .asm
    4140
    42 .obj: $(OBJDIR)
    43 .res: $(OBJDIR)
     41.obj : $(OBJDIR)
     42.res : $(OBJDIR)
    4443
    45 .c.obj: .AUTODEPEND
     44.c.obj:   # .AUTODEPEND
    4645    $(CC) $(CFLAGS) -fo$(OBJDIR)\$^&.obj $^&.c
    4746
    48 .cpp.obj: .AUTODEPEND
     47.cpp.obj: # .AUTODEPEND
    4948    $(CXX) $(CXXFLAGS) -fo$(OBJDIR)\$^&.obj $^&.cpp
    5049
     
    5251    $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $^&.asm
    5352
    54 #.orc.asm:
    55 #    $(RC) $(RCFLAGS) -o $(OBJDIR)\$^&.asm $^&.orc
     53.orc.orc_asm:
     54    $(RC) $(RCFLAGS) -o $^&.orc_asm $^&.orc
     55
     56.orc_asm.obj:
     57    $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $^&.orc_asm
    5658
    5759.orc.obj:
Note: See TracChangeset for help on using the changeset viewer.