Changeset 3032


Ignore:
Timestamp:
Mar 7, 2000, 12:42:12 AM (25 years ago)
Author:
bird
Message:

Makefiles are updated to new style.

Location:
trunk/include
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/include/pdwin32.mk

    r859 r3032  
    1 # $Id: pdwin32.mk,v 1.7 1999-09-07 18:57:54 sandervl Exp $
     1# $Id: pdwin32.mk,v 1.8 2000-03-06 23:42:11 bird Exp $
    22#
    33# PD-Win32 Project
     
    1414#      VAC3 - use IBM VisualAge for C++ 3 compiler environment (default)
    1515#      EMX - use GNU/EMX compiler environment
     16#
    1617
    1718# include compiler environment
  • TabularUnified trunk/include/pdwin32.post

    r3019 r3032  
    1 # $Id: pdwin32.post,v 1.1 2000-03-04 23:46:24 sandervl Exp $
     1# $Id: pdwin32.post,v 1.2 2000-03-06 23:42:11 bird Exp $
    22#
    3 # PD-Win32 Project
     3# Odin32 API
    44#
    5 # Common dll makefile rules (must be included at the last line of the makefile
     5# Common dll makefile rules (must be included at the last line of the makefile)
     6#
     7# If ORGTARGET is defined it is used to generate the importlibrary.
     8#
     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 LOCALCLEAN if only the local directory is to be clean.
     12# Define CLEAN2 to invoke a second clean rule named 'clean2'.
    613#
    714
     15
     16# Copy library rule.
     17!ifndef ORGTARGET
     18$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
     19!else
     20$(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
     21!endif
     22    $(CP) $** $@
     23
     24
     25# Copy dll rule.
     26!ifndef EXETARGET
     27$(PDWIN32_BIN)\$(TARGET).dll: $(OBJDIR)\$(TARGET).dll
     28!else
     29$(PDWIN32_BIN)\$(TARGET).exe: $(OBJDIR)\$(TARGET).exe
     30!endif
     31    $(CP) $** $@
     32    $(CP) $** $@..\..
     33
     34
     35!ifndef NOTEXPDEF
     36# make library from the <>exp.def file.
     37!ifndef ORGTARGET
     38$(TARGET).LIB: $(TARGET)exp.def
     39!else
     40$(ORGTARGET).LIB: $(ORGTARGET)exp.def
     41!endif
     42    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
     43    $(CP) $@ $(PDWIN32_LIB)
     44
     45
     46# make the <>exp.def file.
     47!ifndef ORGTARGET
     48$(TARGET)exp.def: $(TARGET).def
     49!else
     50$(ORGTARGET)exp.def: $(ORGTARGET).def
     51!endif
     52    $(IMPDEF) $** $@
     53!endif
     54
     55
     56# Create the object directory.
     57$(OBJDIR):
     58    @if not exist bin $(MKDIR) bin
     59    @if not exist $(OBJDIR) $(MKDIR) $(OBJDIR)
     60
     61
     62#
     63# General clean rule. To clean more add it to CLEANEXTRAS!
     64#
     65!ifndef CLEAN2
     66clean:
     67!else
     68clean:  clean2
     69!endif
     70    $(RM) $(OBJDIR)\* *.LIB *.res *.map *.pch \
     71!ifndef LOCALCLEAN
     72        $(PDWIN32_LIB)\$(TARGET).LIB \
     73!ifndef EXETARGET
     74        $(PDWIN32_BIN)\$(TARGET).dll $(TARGET)exp.def *.dll \
     75!else
     76        $(PDWIN32_BIN)\$(TARGET).exe *.exe \
     77!endif
     78        $(CLEANEXTRAS)
     79!else
     80        $(CLEANEXTRAS)
     81!endif
     82
     83
     84# Include the dependencies.
    885!ifndef NODEP
    986!include .depend
    1087!endif
    11 
    12 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    13     $(CP) $** $@
    14 
    15 $(TARGET).LIB: $(TARGET)exp.def
    16     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    17     $(CP) $@ $(PDWIN32_LIB)
    18 
    19 $(TARGET)exp.def: $(TARGET).def
    20     $(IMPDEF) $** $@
    21 
    22 $(OBJDIR):
    23     @if not exist bin mkdir bin
    24     @if not exist $(OBJDIR) mkdir $(OBJDIR)
    25 
    26 clean:
    27     $(RM) $(OBJDIR)\*.OBJ
    28     $(RM) $(OBJDIR)\*.lrf
    29     $(RM) *.LIB
    30     $(RM) *.dll
    31     $(RM) *.res
    32     $(RM) *.map
    33     $(RM) *.pch
    34     $(RM) $(RESOURCES).asm
    35     $(RM) $(PDWIN32_LIB)\$(TARGET).LIB
    36     $(RM) $(PDWIN32_BIN)\$(TARGET).dll
    37     $(RM) $(TARGET)exp.def
  • TabularUnified trunk/include/pdwin32.tools

    r3019 r3032  
    1 # $Id: pdwin32.tools,v 1.8 2000-03-04 23:45:30 sandervl Exp $
     1# $Id: pdwin32.tools,v 1.9 2000-03-06 23:42:12 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    1717ECHO        = echo
    1818IMPDEF      = $(PDWIN32_TOOLS)\impdef.exe
     19DEPEND      = $(PDWIN32_TOOLS)\fastdep.exe -o$$(OBJDIR)
    1920#SvL: Remove this when everything has been converted to the new build rules
    20 !ifdef NEWBUILD
    21 DEPEND      = $(PDWIN32_TOOLS)\fastdep.exe -o$$(OBJDIR)
    22 !else
    23 DEPEND      = $(PDWIN32_TOOLS)\fastdep.exe
     21!ifdef OLDBUILD
     22DEPEND      = $(PDWIN32_TOOLS)\fastdep.exe
    2423!endif
    2524
     
    4039# Targets
    4140#
     41.SUFFIXES: .orc
     42
    4243.c{$(OBJDIR)}.obj:
    4344    $(CC) $(CFLAGS) -c -Fo$(OBJDIR)\$(@B).obj $<
     
    4950    $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $<
    5051
     52.orc{$(OBJDIR)}.asm:
     53    $(RC) $(RCFLAGS) -o $(OBJDIR)\$(@B).asm $<
    5154
     55.orc{$(OBJDIR)}.obj:
     56    $(RC) $(RCFLAGS) -o $(OBJDIR)\$(@B).asm $<
     57    $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $(OBJDIR)\$(@B).asm
     58
     59.rc{$(OBJDIR)}.res:
     60    $(OS2RC) $(OS2RCFLAGS) $< $@
     61
     62
     63#
     64# Old Targets
     65#
    5266.c.obj:
    5367    $(CC) $(CFLAGS) -c $<
     
    5973    $(AS) $(ASFLAGS) $<
    6074
     75.orc.asm:
     76    $(RC) $(RCFLAGS) -o $@ $<
    6177
     78.rc.res:
     79    $(OS2RC) $(OS2RCFLAGS) $< $@
     80
  • TabularUnified trunk/include/pdwin32.vac3.dbg

    r3026 r3032  
    1 # $Id: pdwin32.vac3.dbg,v 1.21 2000-03-05 14:52:42 bird Exp $
     1# $Id: pdwin32.vac3.dbg,v 1.22 2000-03-06 23:42:12 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    2929# Tool Flags
    3030#
    31 CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__
    32 CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__
    33 CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__
    34 CFLAGS_WIN32APP  = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__i386__
    35 CXXFLAGS_WIN32APP= -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__i386__
     31CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__
     32CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__
     33CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__
     34CFLAGS_WIN32APP  = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
     35CXXFLAGS_WIN32APP= -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
    3636
    3737!ifdef DEBUGALL
     
    5555LD2FLAGS         = $(LD2FLAGS) /nodebug /nodbgpack
    5656LD2FLAGS_ODINCRT = $(LD2FLAGS_ODINCRT) /nodebug  /nodbgpack
     57CFLAGS           = $(CFLAGS) -DDEFAULT_LOGGING_OFF
     58CXXFLAGS         = $(CXXFLAGS) -DDEFAULT_LOGGING_OFF
    5759!endif
    5860
     61!ifdef EXETARGET
     62CFLAGS           = $(CFLAGS) -Ge+ -Gn-
     63CXXFLAGS         = $(CXXFLAGS) -Ge+ -Gn-
     64LDFLAGS          = $(LDFLAGS) -Ge+
     65LDFLAGS_ODINCRT  = $(LDFLAGS_ODINCRT) -Ge+
     66LD2FLAGS         = $(LD2FLAGS) /EXEC
     67LD2FLAGS_ODINCRT = $(LD2FLAGS_ODINCRT) /EXEC
     68!endif
  • TabularUnified trunk/include/pdwin32.vac3.rel

    r3026 r3032  
    1 # $Id: pdwin32.vac3.rel,v 1.20 2000-03-05 14:52:42 bird Exp $
     1# $Id: pdwin32.vac3.rel,v 1.21 2000-03-06 23:42:12 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    2929# Tool Flags
    3030#
    31 CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -D__i386__
    32 CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -D__i386__
    33 CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -D__i386__
    34 CFLAGS_WIN32APP  = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__i386__
    35 CXXFLAGS_WIN32APP= -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__i386__
     31CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -D__i386__
     32CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -D__i386__
     33CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -D__i386__
     34CFLAGS_WIN32APP  = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
     35CXXFLAGS_WIN32APP= -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
    3636ASFLAGS          = -Mb -Sc -Sv:ALP
    3737LDFLAGS          = -Q -Si -G5 -O+ -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /packcode /packdata /exepack:2 /nod"
     
    4444OS2RCFLAGS       = -r
    4545
     46!ifdef EXETARGET
     47CFLAGS           = $(CFLAGS) -Ge+ -Gn-
     48CXXFLAGS         = $(CXXFLAGS) -Ge+ -Gn-
     49LDFLAGS          = $(LDFLAGS) -Ge+
     50LDFLAGS_ODINCRT  = $(LDFLAGS_ODINCRT) -Ge+
     51LD2FLAGS         = $(LD2FLAGS) /EXEC
     52LD2FLAGS_ODINCRT = $(LD2FLAGS_ODINCRT) /EXEC
     53!endif
  • TabularUnified trunk/include/pdwin32.vac36.dbg

    r3026 r3032  
    1 # $Id: pdwin32.vac36.dbg,v 1.12 2000-03-05 14:52:42 bird Exp $
     1# $Id: pdwin32.vac36.dbg,v 1.13 2000-03-06 23:42:12 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    2929# Tool Flags
    3030#
    31 CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__  -D__WINE__ -DDEBUG -D__i386__
    32 CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__
    33 CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__
    34 CFLAGS_WIN32APP  = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__i386__
    35 CXXFLAGS_WIN32APP= -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__i386__
     31CFLAGS           = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__  -D__WINE__ -DDEBUG -D__i386__
     32CXXFLAGS         = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__
     33CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -DDEBUG -D__i386__
     34CFLAGS_WIN32APP  = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
     35CXXFLAGS_WIN32APP= -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
    3636
    3737!ifdef DEBUGALL
     
    5555LD2FLAGS         = $(LD2FLAGS) /nodebug /nodbgpack
    5656LD2FLAGS_ODINCRT = $(LD2FLAGS_ODINCRT) /nodebug  /nodbgpack
     57CFLAGS           = $(CFLAGS) -DDEFAULT_LOGGING_OFF
     58CXXFLAGS         = $(CXXFLAGS) -DDEFAULT_LOGGING_OFF
    5759!endif
    5860
     61!ifdef EXETARGET
     62CFLAGS           = $(CFLAGS) -Ge+ -Gn-
     63CXXFLAGS         = $(CXXFLAGS) -Ge+ -Gn-
     64LDFLAGS          = $(LDFLAGS) -Ge+
     65LDFLAGS_ODINCRT  = $(LDFLAGS_ODINCRT) -Ge+
     66LD2FLAGS         = $(LD2FLAGS) /EXEC
     67LD2FLAGS_ODINCRT = $(LD2FLAGS_ODINCRT) /EXEC
     68!endif
  • TabularUnified trunk/include/pdwin32.vac36.rel

    r3026 r3032  
    1 # $Id: pdwin32.vac36.rel,v 1.11 2000-03-05 14:52:42 bird Exp $
     1# $Id: pdwin32.vac36.rel,v 1.12 2000-03-06 23:42:12 bird Exp $
    22# ODIN / win32os2 Project
    33#
     
    2929# Tool Flags
    3030#
    31 CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -D__i386__
    32 CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -D__i386__
    33 CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__WINE__ -D__i386__
    34 CFLAGS_WIN32APP  = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__i386__
    35 CXXFLAGS_WIN32APP= -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -D__WIN32OS2__ -D__i386__
     31CFLAGS           = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -D__i386__
     32CXXFLAGS         = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -D__i386__
     33CXXFLAGS_ODINCRT = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__WINE__ -D__i386__
     34CFLAGS_WIN32APP  = -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
     35CXXFLAGS_WIN32APP= -Q -Si -G5 -O+ -Oi+ -Ge- -Ss+ -W3 -Gm+ /Gn+ -I$(PDWIN32_INCLUDE)\Win -I. -I$(PDWIN32_INCLUDE) -D__WIN32OS2__ -D__i386__
    3636ASFLAGS          = -Mb -Sc -Sv:ALP
    3737LDFLAGS          = -Q -Si -G5 -O+ -Ge- -Ss+ -W3 -Gm+ /B"/noe /map /packcode /packdata /exepack:2 /nod"
     
    4444OS2RCFLAGS       = -r
    4545
     46!ifdef EXETARGET
     47CFLAGS           = $(CFLAGS) -Ge+ -Gn-
     48CXXFLAGS         = $(CXXFLAGS) -Ge+ -Gn-
     49LDFLAGS          = $(LDFLAGS) -Ge+
     50LDFLAGS_ODINCRT  = $(LDFLAGS_ODINCRT) -Ge+
     51LD2FLAGS         = $(LD2FLAGS) /EXEC
     52LD2FLAGS_ODINCRT = $(LD2FLAGS_ODINCRT) /EXEC
     53!endif
Note: See TracChangeset for help on using the changeset viewer.