Changeset 3031 for trunk/src


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

Makefiles are updated to new style.
Odin32 resource files are renamed to *.orc and most have changed name to avoid
name clashes for object files.

Location:
trunk/src
Files:
91 added
91 deleted
67 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/DPlayX/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.7 2000-02-09 23:46:52 bird Exp $
     1# $Id: makefile,v 1.8 2000-03-06 23:38:14 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       dplayx.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = dsoundrsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\dplayx.obj\
     27$(OBJDIR)\dplayxrsrc.obj \
     28$(PDWIN32_LIB)/dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = dplayx
    2333
    24 OBJS =  dplayx.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2534
    26 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2740
    2841
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/advapi32.lib \
    33           OS2386.LIB $(RTLLIB_O) \
    34           $(PDWIN32_LIB)/ole32.lib $(PDWIN32_LIB)/msvfw32.lib
    35     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3644
    3745
    38 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    39 
    40 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    41     $(CP) $** $@
    42 
    43 $(TARGET).lib: $(TARGET)exp.def
    44         $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    45         $(CP) $@ $(PDWIN32_LIB)
    46 
    47 $(TARGET)exp.def: $(TARGET).def
    48     $(IMPDEF) $** $@
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4949
    5050
    51 resource.asm: $(TARGET).rc
    52     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)/kernel32.lib
     58$(PDWIN32_LIB)/odincrt.lib
     59$(PDWIN32_LIB)/advapi32.lib
     60OS2386.LIB
     61$(RTLLIB_O)
     62$(PDWIN32_LIB)/ole32.lib
     63$(PDWIN32_LIB)/msvfw32.lib
     64$(TARGET).def
     65<<keep
    5366
    5467
     68# Dep rule - makes depenencies for C, C++ and Asm files.
    5569dep:
    5670    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5771        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5872
    59 !ifndef NODEP
    60 !include .depend
    61 !endif
    6273
     74# Includes the common rules.
     75!include $(PDWIN32_INCLUDE)/pdwin32.post
    6376
    64 clean:
    65     $(RM) *.obj *.lib *.dll *~ *.map *.pch \
    66         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    67         resource.asm $(TARGET)exp.def
    68 
  • trunk/src/NTDLL/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.20 2000-02-09 23:46:52 bird Exp $
     1# $Id: makefile,v 1.21 2000-03-06 23:38:14 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       NTDLL.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = ntdllrsrc.asm
    2022
    2123
    22 OBJS = NTDLL.obj\
    23        file.obj\
    24        exception.obj\
    25        nt.obj\
    26        om.obj\
    27        reg.obj\
    28        rtl.obj\
    29        rtlstr.obj\
    30        sec.obj\
    31        sync.obj\
    32        initterm.obj\
    33        time.obj\
    34        unknown.obj\
    35        arith64.obj\
    36        regfunc.obj resource.obj
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\NTDLL.obj \
     27$(OBJDIR)\file.obj \
     28$(OBJDIR)\exception.obj \
     29$(OBJDIR)\nt.obj \
     30$(OBJDIR)\om.obj \
     31$(OBJDIR)\reg.obj \
     32$(OBJDIR)\rtl.obj \
     33$(OBJDIR)\rtlstr.obj \
     34$(OBJDIR)\sec.obj \
     35$(OBJDIR)\sync.obj \
     36$(OBJDIR)\initterm.obj \
     37$(OBJDIR)\time.obj \
     38$(OBJDIR)\unknown.obj \
     39$(OBJDIR)\arith64.obj \
     40$(OBJDIR)\regfunc.obj \
     41$(OBJDIR)\ntdllrsrc.obj
    3742
    3843
     44# Target name - name of the dll without extention and path.
    3945TARGET = NTDLL
    4046
    41 all: $(TARGET).dll $(TARGET).lib
     47
     48# All rule - build objs, target dll, copies dll to bin and makes libs.
     49all:    $(OBJDIR) \
     50        $(OBJDIR)\$(TARGET).dll \
     51        $(PDWIN32_BIN)\$(TARGET).dll \
     52        lib
    4253
    4354
    44 $(TARGET).dll: $(OBJS) $(TARGET).def
    45     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) sbsstub.obj $(TARGET).def $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)\user32.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/crtdll.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    46     $(CP) $@ $(PDWIN32_BIN)
     55# Lib rule - build importlibrary (and evt. other libs)
     56lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    4757
    4858
    49 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    50 
    51 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    52     $(CP) $** $@
    53 
    54 $(TARGET).lib: $(TARGET)exp.def
    55     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    56     $(CP) $@ $(PDWIN32_LIB)
    57 
    58 $(TARGET)exp.def: $(TARGET).def
    59     $(IMPDEF) $** $@
     59# Dll rule - builds the target dll.
     60$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     61    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    6062
    6163
    62 resource.asm: $(TARGET).rc
    63     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     64# Linker file - creates the parameter file passed on to the linker.
     65$(OBJDIR)\$(TARGET).lrf: makefile
     66    @echo Creating file <<$@
     67/OUT:$(OBJDIR)\$(TARGET).dll
     68/MAP:$(OBJDIR)\$(TARGET).map
     69$(OBJS)
     70sbsstub.obj
     71$(PDWIN32_LIB)/kernel32.lib
     72$(PDWIN32_LIB)/user32.lib
     73$(PDWIN32_LIB)/kernel32.lib
     74$(PDWIN32_LIB)/crtdll.lib
     75$(PDWIN32_LIB)/odincrt.lib
     76OS2386.LIB
     77$(RTLLIB_O)
     78$(TARGET).def
     79<<keep
    6480
    6581
     82# Dep rule - makes depenencies for C, C++ and Asm files.
    6683dep:
    6784    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    6885        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    6986
    70 !ifndef NODEP
    71 !include .depend
    72 !endif
    7387
     88# Includes the common rules.
     89!include $(PDWIN32_INCLUDE)/pdwin32.post
    7490
    75 clean:
    76     $(RM) *.obj *.lib *.dll *.map *.pch \
    77         $(PDWIN32_LIB)\$(TARGET).lib $(PDWIN32_BIN)\$(TARGET).dll \
    78         resource.asm $(TARGET)exp.def
    79 
  • trunk/src/advapi32/makefile

    r2983 r3031  
    1 # $Id: makefile,v 1.22 2000-03-03 11:14:58 sandervl Exp $
     1# $Id: makefile,v 1.23 2000-03-06 23:38:15 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       advapi32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    17 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    18 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     19
     20# Flag overloads and local macros.
     21CLEANEXTRAS = advapi32rsrc.asm
    1922
    2023
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\advapi32.obj \
     27$(OBJDIR)\advapi32rsrc.obj \
     28$(OBJDIR)\lsa.obj \
     29$(OBJDIR)\security.obj \
     30$(OBJDIR)\service.obj \
     31$(OBJDIR)\eventlog.obj \
     32$(OBJDIR)\crypt.obj \
     33$(PDWIN32_LIB)/dllentry.obj
     34
     35
     36# Target name - name of the dll without extention and path.
    2137TARGET = advapi32
    2238
    23 OBJS =  advapi32.obj resource.obj lsa.obj security.obj service.obj eventlog.obj crypt.obj $(PDWIN32_LIB)/dllentry.obj
     39
     40# All rule - build objs, target dll, copies dll to bin and makes libs.
     41all:    $(OBJDIR) \
     42        $(OBJDIR)\$(TARGET).dll \
     43        $(PDWIN32_BIN)\$(TARGET).dll \
     44        lib
    2445
    2546
    26 all: $(TARGET).dll $(TARGET).lib
     47# Lib rule - build importlibrary (and evt. other libs)
     48lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    2749
    2850
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/ntdll.lib \
    32           $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/pmwinx.lib OS2386.LIB $(RTLLIB_O)
    33     $(CP) $@ $(PDWIN32_BIN)
     51# Dll rule - builds the target dll.
     52$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     53    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    3454
    3555
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
    41 $(TARGET).lib: $(TARGET)exp.def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    43     $(CP) $@ $(PDWIN32_LIB)
    44 
    45 $(TARGET)exp.def: $(TARGET).def
    46     $(IMPDEF) $** $@
     56# Linker file - creates the parameter file passed on to the linker.
     57$(OBJDIR)\$(TARGET).lrf: makefile
     58    @echo Creating file <<$@
     59/OUT:$(OBJDIR)\$(TARGET).dll
     60/MAP:$(OBJDIR)\$(TARGET).map
     61$(OBJS)
     62$(PDWIN32_LIB)/kernel32.lib
     63$(PDWIN32_LIB)/ntdll.lib
     64$(PDWIN32_LIB)/odincrt.lib
     65$(PDWIN32_LIB)/pmwinx.lib
     66OS2386.LIB
     67$(RTLLIB_O)
     68$(TARGET).def
     69<<keep
    4770
    4871
    49 resource.asm: $(TARGET).rc
    50     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
    51 
     72# Dep rule - makes depenencies for C, C++ and Asm files.
    5273dep:
    5374    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5475        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5576
    56 !ifndef NODEP
    57 !include .depend
    58 !endif
    5977
     78# Includes the common rules.
     79!include $(PDWIN32_INCLUDE)/pdwin32.post
    6080
    61 clean:
    62     $(RM) *.obj *.lib *.dll *.map *.pch \
    63         $(PDWIN32_BIN)\$(TARGET).dll  \
    64         $(PDWIN32_LIB)\$(TARGET).lib  \
    65         $(TARGET)exp.def resource.asm
    66 
  • trunk/src/avifil32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.7 2000-02-09 23:46:53 bird Exp $
     1# $Id: makefile,v 1.8 2000-03-06 23:38:16 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       avifil32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
     15
     16# Compiler, tools, and interference rules.
    1417!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1518
    1619
    17 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    18 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = avifile32.asm
    1922
    2023
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\avifile.obj \
     27$(OBJDIR)\avifil32.obj \
     28$(PDWIN32_LIB)\dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2132TARGET = avifil32
    2233
    23 OBJS =  avifile.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2434
    25 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2640
    2741
    28 $(TARGET).dll: $(OBJS) $(TARGET).def
    29     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    30           $(PDWIN32_LIB)/kernel32.lib \
    31           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
    32           $(PDWIN32_LIB)/ole32.lib $(PDWIN32_LIB)/msvfw32.lib
    33     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3444
    3545
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    3749
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    4050
    41 $(TARGET).lib: $(TARGET)exp.def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    43     $(CP) $@ $(PDWIN32_LIB)
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)/kernel32.lib
     58$(PDWIN32_LIB)/odincrt.lib
     59OS2386.LIB
     60$(RTLLIB_O)
     61$(PDWIN32_LIB)/ole32.lib
     62$(PDWIN32_LIB)/msvfw32.lib
     63$(TARGET).def
     64<<keep
    4465
    45 $(TARGET)exp.def: $(TARGET).def
    46     $(IMPDEF) $** $@
    4766
    48 resource.asm: $(TARGET).rc
    49     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
    50 
     67# Dep rule - makes depenencies for C, C++ and Asm files.
    5168dep:
    5269    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5370        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5471
    55 !ifndef NODEP
    56 !include .depend
    57 !endif
    5872
     73# Includes the common rules.
     74!include $(PDWIN32_INCLUDE)/pdwin32.post
    5975
    60 clean:
    61     $(RM) *.obj *.lib *.dll *.map *.pch \
    62         $(PDWIN32_BIN)\$(TARGET).dll \
    63         $(PDWIN32_LIB)\$(TARGET).lib \
    64         resource.asm  $(TARGET)exp.def
    65 
  • trunk/src/capi2032/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.11 2000-02-09 23:46:53 bird Exp $
     1# $Id: makefile,v 1.12 2000-03-06 23:38:17 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       capi2032.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = capi2032rsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\capi2032.obj \
     27$(OBJDIR)\capi2032rsrc.obj \
     28$(PDWIN32_LIB)\dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = capi2032
    2333
    24 OBJS =  capi2032.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
     34
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2540
    2641
    27 all: $(TARGET).dll $(TARGET).lib
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    2844
    2945
    30 $(TARGET).dll: $(OBJS) $(TARGET).def
    31     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    32           $(PDWIN32_LIB)/kernel32.lib \
    33           $(PDWIN32_LIB)/odincrt.lib \
    34           OS2386.LIB $(RTLLIB_O)
    35     $(CP) $@ $(PDWIN32_BIN)
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    3649
    3750
    38 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    39 
    40 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    41     $(CP) $** $@
    42 
    43 $(TARGET).lib: $(TARGET)exp.def
    44     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    45     $(CP) $@ $(PDWIN32_LIB)
    46 
    47 $(TARGET)exp.def: $(TARGET).def
    48     $(IMPDEF) $** $@
    49 
    50 resource.asm: $(TARGET).rc
    51     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)/kernel32.lib
     58$(PDWIN32_LIB)/odincrt.lib
     59OS2386.LIB
     60$(RTLLIB_O)
     61$(TARGET).def
     62<<keep
    5263
    5364
     65# Dep rule - makes depenencies for C, C++ and Asm files.
    5466dep:
    5567    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5668        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5769
    58 !ifndef NODEP
    59 !include .depend
    60 !endif
    6170
     71# Includes the common rules.
     72!include $(PDWIN32_INCLUDE)/pdwin32.post
    6273
    63 clean:
    64     $(RM) *.obj *.lib *.dll *~ *.map *.pch \
    65         $(PDWIN32_BIN)\$(TARGET).dll \
    66         $(PDWIN32_LIB)\$(TARGET).lib \
    67         resource.asm $(TARGET)exp.def
    68 
  • trunk/src/comctl32/makefile

    r2875 r3031  
    1 # $Id: makefile,v 1.23 2000-02-23 17:09:44 cbratschi Exp $
     1# $Id: makefile,v 1.24 2000-03-06 23:38:17 bird Exp $
     2
    23#
    3 # PD-Win32 API
     4# Odin32 API
    45#
    56#       comctl32.dll makefile
    67#
    78
     9# Directory macros.
    810PDWIN32_INCLUDE = ..\..\include
    9 PDWIN32_LIB = ..\..\lib
    10 PDWIN32_BIN = ..\..\bin
    11 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1214
    1315
     16# Compiler, tools, and interference rules.
    1417!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1518
    1619
    17 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    18 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = lz32rsrc.asm
    1922
     23
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\comctl32.obj \
     27$(OBJDIR)\initterm.obj \
     28$(OBJDIR)\progress.obj \
     29$(OBJDIR)\comctl32undoc.obj \
     30$(OBJDIR)\imagelist.obj \
     31$(OBJDIR)\comboex.obj \
     32$(OBJDIR)\animate.obj \
     33$(OBJDIR)\datetime.obj \
     34$(OBJDIR)\flatsb.obj \
     35$(OBJDIR)\hotkey.obj \
     36$(OBJDIR)\monthcal.obj \
     37$(OBJDIR)\nativefont.obj \
     38$(OBJDIR)\pager.obj \
     39$(OBJDIR)\tab.obj \
     40$(OBJDIR)\status.obj \
     41$(OBJDIR)\header.obj \
     42$(OBJDIR)\updown.obj \
     43$(OBJDIR)\rebar.obj \
     44$(OBJDIR)\trackbar.obj \
     45$(OBJDIR)\tooltips.obj \
     46$(OBJDIR)\toolbar.obj \
     47$(OBJDIR)\treeview.obj \
     48$(OBJDIR)\propsheet.obj \
     49$(OBJDIR)\listview.obj \
     50$(OBJDIR)\draglist.obj \
     51$(OBJDIR)\ipaddress.obj \
     52$(OBJDIR)\ccbase.obj \
     53$(OBJDIR)\rsrc.obj
     54
     55
     56# Target name - name of the dll without extention and path.
    2057TARGET = comctl32
    2158
    22 OBJS =  comctl32.obj initterm.obj progress.obj comctl32undoc.obj imagelist.obj \
    23         comboex.obj animate.obj datetime.obj flatsb.obj hotkey.obj monthcal.obj \
    24         nativefont.obj pager.obj tab.obj status.obj header.obj updown.obj \
    25         rebar.obj trackbar.obj tooltips.obj toolbar.obj treeview.obj \
    26         propsheet.obj listview.obj draglist.obj ipaddress.obj resource.obj \
    27         ccbase.obj
    2859
    29 all: $(TARGET).dll $(TARGET).lib
     60# All rule - build objs, target dll, copies dll to bin and makes libs.
     61all:    $(OBJDIR) \
     62        $(OBJDIR)\$(TARGET).dll \
     63        $(PDWIN32_BIN)\$(TARGET).dll \
     64        lib
    3065
    3166
    32 $(TARGET).dll: $(OBJS) $(TARGET).def
    33     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    34           $(PDWIN32_LIB)/kernel32.lib \
    35           $(PDWIN32_LIB)/gdi32.lib \
    36           $(PDWIN32_LIB)/user32.lib  $(PDWIN32_LIB)/odincrt.lib \
    37           $(PDWIN32_LIB)/winmm.lib \
    38           OS2386.LIB  $(RTLLIB_O)
    39     $(CP) $@ $(PDWIN32_BIN)
     67# Lib rule - build importlibrary (and evt. other libs)
     68lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    4069
    4170
    42 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    43 
    44 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    45     $(CP) $** $@
    46 
    47 $(TARGET).lib: $(TARGET)exp.def
    48     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    49     $(CP) $@ $(PDWIN32_LIB)
    50 
    51 $(TARGET)exp.def: $(TARGET).def
    52     $(IMPDEF) $** $@
     71# Dll rule - builds the target dll.
     72$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     73    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    5374
    5475
    55 resource.asm: rsrc.rc
    56     $(RC) $(RCFLAGS) -o resource.asm rsrc.rc
     76# Linker file - creates the parameter file passed on to the linker.
     77$(OBJDIR)\$(TARGET).lrf: makefile
     78    @echo Creating file <<$@
     79/OUT:$(OBJDIR)\$(TARGET).dll
     80/MAP:$(OBJDIR)\$(TARGET).map
     81$(OBJS)
     82$(PDWIN32_LIB)/kernel32.lib
     83$(PDWIN32_LIB)/gdi32.lib
     84$(PDWIN32_LIB)/user32.lib
     85$(PDWIN32_LIB)/odincrt.lib
     86$(PDWIN32_LIB)/winmm.lib
     87OS2386.LIB
     88$(RTLLIB_O)
     89$(TARGET).def
     90<<keep
    5791
    5892
     93# Dep rule - makes depenencies for C, C++ and Asm files.
    5994dep:
    6095    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    6196        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    6297
    63 !ifndef NODEP
    64 !include .depend
    65 !endif
    6698
     99# Includes the common rules.
     100!include $(PDWIN32_INCLUDE)/pdwin32.post
    67101
    68 clean:
    69     $(RM) *.obj *.lib *.dll *.map *.pch \
    70         $(PDWIN32_BIN)\$(TARGET).dll \
    71         $(PDWIN32_LIB)\$(TARGET).lib \
    72         $(TARGET)exp.def
    73 
  • trunk/src/comdlg32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.15 2000-02-09 23:46:53 bird Exp $
     1# $Id: makefile,v 1.16 2000-03-06 23:38:30 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       comdlg32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = rsrc.asm
    2022
     23
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\comdlg32.obj \
     27$(OBJDIR)\initterm.obj \
     28$(OBJDIR)\cdlg32.obj \
     29$(OBJDIR)\finddlg32.obj \
     30$(OBJDIR)\filedlg95.obj \
     31$(OBJDIR)\filedlgbrowser.obj \
     32$(OBJDIR)\filetitle.obj \
     33$(OBJDIR)\comdlgguid.obj \
     34$(OBJDIR)\rsrc.obj
     35
     36
     37# Target name - name of the dll without extention and path.
    2138TARGET = comdlg32
    2239
    23 OBJS =  comdlg32.obj initterm.obj resource.obj cdlg32.obj finddlg32.obj filedlg95.obj \
    24         filedlgbrowser.obj filetitle.obj comdlgguid.obj
    2540
    26 all: $(TARGET).dll $(TARGET).lib
     41# All rule - build objs, target dll, copies dll to bin and makes libs.
     42all:    $(OBJDIR) \
     43        $(OBJDIR)\$(TARGET).dll \
     44        $(PDWIN32_BIN)\$(TARGET).dll \
     45        lib
    2746
    2847
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/shlwapi.lib \
    33           $(PDWIN32_LIB)/shell32.lib $(PDWIN32_LIB)/gdi32.lib OS2386.LIB $(RTLLIB_O)
    34     $(CP) $@ $(PDWIN32_BIN)
     48# Lib rule - build importlibrary (and evt. other libs)
     49lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3550
    3651
    37 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    38 
    39 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    40     $(CP) $** $@
    41 
    42 $(TARGET).lib: $(TARGET)exp.def
    43     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    44     $(CP) $@ $(PDWIN32_LIB)
    45 
    46 $(TARGET)exp.def: $(TARGET).def
    47     $(IMPDEF) $** $@
    48 
    49 resource.asm: rsrc.rc
    50     $(RC) $(RCFLAGS) -o resource.asm rsrc.rc
     52# Dll rule - builds the target dll.
     53$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     54    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    5155
    5256
     57# Linker file - creates the parameter file passed on to the linker.
     58$(OBJDIR)\$(TARGET).lrf: makefile
     59    @echo Creating file <<$@
     60/OUT:$(OBJDIR)\$(TARGET).dll
     61/MAP:$(OBJDIR)\$(TARGET).map
     62$(OBJS)
     63$(PDWIN32_LIB)/pmwinx.lib
     64$(PDWIN32_LIB)/kernel32.lib
     65$(PDWIN32_LIB)/user32.lib
     66$(PDWIN32_LIB)/odincrt.lib
     67$(PDWIN32_LIB)/shlwapi.lib
     68$(PDWIN32_LIB)/shell32.lib
     69$(PDWIN32_LIB)/gdi32.lib
     70OS2386.LIB
     71$(RTLLIB_O)
     72$(TARGET).def
     73<<keep
     74
     75
     76# Dep rule - makes depenencies for C, C++ and Asm files.
    5377dep:
    5478    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5579        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5680
    57 !ifndef NODEP
    58 !include .depend
    59 !endif
    6081
     82# Includes the common rules.
     83!include $(PDWIN32_INCLUDE)/pdwin32.post
    6184
    62 clean:
    63     $(RM) *.obj *.lib *.dll *.map *.pch \
    64         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    65         resource.asm $(TARGET)exp.def
  • trunk/src/crtdll/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.9 2000-02-09 23:46:53 bird Exp $
     1# $Id: makefile,v 1.10 2000-03-06 23:38:33 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       crtdll.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = crtdllrsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\crtdll.obj \
     27$(OBJDIR)\asmhlp.obj \
     28$(OBJDIR)\stubs.obj \
     29$(OBJDIR)\internal.obj \
     30$(OBJDIR)\crt_string.obj \
     31$(OBJDIR)\crt_memory.obj \
     32$(OBJDIR)\crt_mb.obj \
     33$(OBJDIR)\crt_wc.obj \
     34$(OBJDIR)\initterm.obj \
     35$(OBJDIR)\crtdllrsrc.obj
     36
     37
     38# Target name - name of the dll without extention and path.
    2239TARGET = crtdll
    2340
    24 OBJS =  crtdll.obj asmhlp.obj stubs.obj internal.obj crt_string.obj \
    25         crt_memory.obj crt_mb.obj crt_wc.obj initterm.obj resource.obj
    2641
    27 all: $(TARGET).dll $(TARGET).lib
     42# All rule - build objs, target dll, copies dll to bin and makes libs.
     43all:    $(OBJDIR) \
     44        $(OBJDIR)\$(TARGET).dll \
     45        $(PDWIN32_BIN)\$(TARGET).dll \
     46        lib
    2847
    2948
    30 $(TARGET).dll: $(OBJS) $(TARGET).def
    31     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    32           $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
    33           $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/user32.lib OS2386.LIB $(RTLLIB_O)
    34     $(CP) $@ $(PDWIN32_BIN)
     49# Lib rule - build importlibrary (and evt. other libs)
     50lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3551
    3652
    37 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    38 
    39 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    40     $(CP) $** $@
    41 
    42 $(TARGET).lib: $(TARGET)exp.def
    43     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    44     $(CP) $@ $(PDWIN32_LIB)
    45 
    46 $(TARGET)exp.def: $(TARGET).def
    47     $(IMPDEF) $** $@
    48 
    49 resource.asm: $(TARGET).rc
    50     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     53# Dll rule - builds the target dll.
     54$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     55    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    5156
    5257
     58# Linker file - creates the parameter file passed on to the linker.
     59$(OBJDIR)\$(TARGET).lrf: makefile
     60    @echo Creating file <<$@
     61/OUT:$(OBJDIR)\$(TARGET).dll
     62/MAP:$(OBJDIR)\$(TARGET).map
     63$(OBJS)
     64$(PDWIN32_LIB)/pmwinx.lib
     65$(PDWIN32_LIB)/kernel32.lib
     66$(PDWIN32_LIB)/odincrt.lib
     67$(PDWIN32_LIB)/user32.lib
     68OS2386.LIB
     69$(RTLLIB_O)
     70$(TARGET).def
     71<<keep
     72
     73
     74# Dep rule - makes depenencies for C, C++ and Asm files.
    5375dep:
    5476    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5577        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5678
    57 !ifndef NODEP
    58 !include .depend
    59 !endif
    6079
     80# Includes the common rules.
     81!include $(PDWIN32_INCLUDE)/pdwin32.post
    6182
    62 clean:
    63     $(RM) *.obj *.lib *.dll *.map *.pch \
    64         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    65         resource.asm $(TARGET)exp.def
  • trunk/src/ddraw/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.22 2000-02-09 23:46:54 bird Exp $
     1# $Id: makefile,v 1.23 2000-03-06 23:38:34 bird Exp $
    22#
    33# ddraw.dll makefile
     
    1010#
    1111
     12# Directory macros.
    1213PDWIN32_INCLUDE = ..\..\include
    13 PDWIN32_LIB = ..\..\lib
    14 PDWIN32_BIN = ..\..\bin
    15 PDWIN32_TOOLS = ..\..\tools\bin
     14PDWIN32_LIB     = ..\..\lib
     15PDWIN32_BIN     = ..\..\$(OBJDIR)
     16PDWIN32_TOOLS   = ..\..\tools\bin
    1617
    1718
     19# Compiler, tools, and interference rules.
    1820!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1921
    20 ASFLAGS = -Sc -Sv:ALP
    2122
    22 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE);
    23 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE);
     23# Flag overloads and local macros.
     24CLEANEXTRAS = ddrawrsrc.asm
     25ASFLAGS     = -Sc -Sv:ALP
    2426
     27
     28# Object files. All objects should be prefixed with $(OBJDIR)!
     29OBJS = \
     30$(OBJDIR)\ddraw.obj \
     31$(OBJDIR)\os2ddraw.obj \
     32$(OBJDIR)\os2clipper.obj \
     33$(OBJDIR)\os2d3d.obj \
     34$(OBJDIR)\iccio1.obj \
     35$(OBJDIR)\asmutil.obj \
     36$(OBJDIR)\os2surface.obj \
     37$(OBJDIR)\os2palette.obj \
     38$(OBJDIR)\os2palset.obj \
     39$(OBJDIR)\rectangle.obj \
     40$(OBJDIR)\initterm.obj \
     41$(OBJDIR)\os2util.obj \
     42$(OBJDIR)\bltFunc.obj \
     43$(OBJDIR)\fillfunc.obj \
     44$(OBJDIR)\colorconv.obj \
     45$(OBJDIR)\ddrawrsrc.obj
     46
     47
     48# Target name - name of the dll without extention and path.
    2549TARGET = ddraw
    2650
    27 OBJS =  ddraw.obj os2ddraw.obj os2clipper.obj os2d3d.obj iccio1.obj asmutil.obj\
    28         os2surface.obj os2palette.obj os2palset.obj rectangle.obj initterm.obj \
    29         os2util.obj bltFunc.obj fillfunc.obj colorconv.obj resource.obj
     51
     52# All rule - build objs, target dll, copies dll to bin and makes libs.
     53all:    $(OBJDIR) \
     54        $(OBJDIR)\$(TARGET).dll \
     55        $(PDWIN32_BIN)\$(TARGET).dll \
     56        lib
    3057
    3158
    32 LIBS =  $(PDWIN32_LIB)\ole32.lib $(PDWIN32_LIB)\advapi32.lib $(PDWIN32_LIB)\gdi32.lib \
    33         $(PDWIN32_LIB)\comctl32.lib $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)\odincrt.lib \
    34         $(PDWIN32_LIB)\user32.lib mmpm2.lib OS2386.LIB $(RTLLIB_O)
    35 
    36 all: $(TARGET).dll $(TARGET).lib
     59# Lib rule - build importlibrary (and evt. other libs)
     60lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3761
    3862
    39 $(TARGET).dll: $(OBJS) $(TARGET).def
    40     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def $(LIBS)
    41     $(CP) $@ $(PDWIN32_BIN)
     63# Dll rule - builds the target dll.
     64$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     65    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4266
    4367
    44 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    45 
    46 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    47     $(CP) $** $@
    48 
    49 $(TARGET).lib: $(TARGET)exp.def
    50     $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    51     $(CP) $@ $(PDWIN32_LIB)
    52 
    53 $(TARGET)exp.def: $(TARGET).def
    54     $(IMPDEF) $** $@
     68# Linker file - creates the parameter file passed on to the linker.
     69$(OBJDIR)\$(TARGET).lrf: makefile
     70    @echo Creating file <<$@
     71/OUT:$(OBJDIR)\$(TARGET).dll
     72/MAP:$(OBJDIR)\$(TARGET).map
     73$(OBJS)
     74$(PDWIN32_LIB)/ole32.lib
     75$(PDWIN32_LIB)/advapi32.lib
     76$(PDWIN32_LIB)/gdi32.lib
     77$(PDWIN32_LIB)/comctl32.lib
     78$(PDWIN32_LIB)/kernel32.lib
     79$(PDWIN32_LIB)/odincrt.lib
     80$(PDWIN32_LIB)/user32.lib
     81mmpm2.lib
     82OS2386.LIB
     83$(RTLLIB_O)
     84$(TARGET).def
     85<<keep
    5586
    5687
    57 resource.asm: $(TARGET).rc
    58     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
    59 
    60 
     88# Dep rule - makes depenencies for C, C++ and Asm files.
    6189dep:
    6290    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    6391        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    6492
    65 !ifndef NODEP
    66 !include .depend
    67 !endif
    6893
     94# Includes the common rules.
     95!include $(PDWIN32_INCLUDE)/pdwin32.post
    6996
    70 clean:
    71     $(RM) *.obj *.lib *.dll *.map *.pch \
    72         $(PDWIN32_BIN)\$(TARGET).dll \
    73         $(PDWIN32_LIB)\$(TARGET).lib \
    74         resource.asm $(TARGET)exp.def
    75 
  • trunk/src/dinput/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.5 2000-02-09 23:46:54 bird Exp $
     1# $Id: makefile,v 1.6 2000-03-06 23:38:35 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 #       dplay.dll makefile
     6#       dinput.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = dinputrsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\dinput.obj \
     27$(OBJDIR)\oslibinput.obj \
     28$(OBJDIR)\dinputguid.obj \
     29$(OBJDIR)\dinputrsrc.obj \
     30$(PDWIN32_LIB)\dllentry.obj
     31
     32
     33# Target name - name of the dll without extention and path.
    2234TARGET = dinput
    2335
    24 OBJS =  dinput.obj oslibinput.obj dinputguid.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2536
    26 all: $(TARGET).dll $(TARGET).lib
     37# All rule - build objs, target dll, copies dll to bin and makes libs.
     38all:    $(OBJDIR) \
     39        $(OBJDIR)\$(TARGET).dll \
     40        $(PDWIN32_BIN)\$(TARGET).dll \
     41        lib
    2742
    2843
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
    33           $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/ole32.lib
    34     $(CP) $@ $(PDWIN32_BIN)
     44# Lib rule - build importlibrary (and evt. other libs)
     45lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3546
    3647
    37 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    38 
    39 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    40     $(CP) $** $@
    41 
    42 $(TARGET).lib: $(TARGET)exp.def
    43     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    44     $(CP) $@ $(PDWIN32_LIB)
    45 
    46 $(TARGET)exp.def: $(TARGET).def
    47     $(IMPDEF) $** $@
     48# Dll rule - builds the target dll.
     49$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     50    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4851
    4952
    50 resource.asm: $(TARGET).rc
    51     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     53# Linker file - creates the parameter file passed on to the linker.
     54$(OBJDIR)\$(TARGET).lrf: makefile
     55    @echo Creating file <<$@
     56/OUT:$(OBJDIR)\$(TARGET).dll
     57/MAP:$(OBJDIR)\$(TARGET).map
     58$(OBJS)
     59$(PDWIN32_LIB)/kernel32.lib
     60$(PDWIN32_LIB)/odincrt.lib
     61OS2386.LIB
     62$(RTLLIB_O)
     63$(PDWIN32_LIB)/user32.lib
     64$(PDWIN32_LIB)/ole32.lib
     65$(TARGET).def
     66<<keep
    5267
    5368
     69# Dep rule - makes depenencies for C, C++ and Asm files.
    5470dep:
    5571    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5672        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5773
    58 !ifndef NODEP
    59 !include .depend
    60 !endif
    6174
     75# Includes the common rules.
     76!include $(PDWIN32_INCLUDE)/pdwin32.post
    6277
    63 clean:
    64     $(RM) *.obj *.lib *.dll *.map *.pch \
    65         $(PDWIN32_BIN)\$(TARGET).dll \
    66         $(PDWIN32_LIB)\$(TARGET).lib \
    67         $(TARGET)exp.def resource.asm
    68 
  • trunk/src/dllentry/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.3 2000-02-09 23:46:55 bird Exp $
     1# $Id: makefile,v 1.4 2000-03-06 23:38:35 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       dllentry library makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
     15
     16# Compiler, tools, and interference rules.
    1417!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1518
    1619
    17 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    18 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = lz32rsrc.asm
    1922
    2023
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\dllentry.obj
     27
     28
     29# Target name - name of the obj without extention and path.
    2130TARGET = dllentry
    2231
    23 all: $(PDWIN32_LIB)\$(TARGET).obj
    2432
    25 $(PDWIN32_LIB)\$(TARGET).obj: dllentry.obj
    26     $(CP) $(TARGET).obj $(PDWIN32_LIB)
     33# All rule - build objs and copies obj to lib.
     34all: $(OBJDIR) $(PDWIN32_LIB)\$(TARGET).obj
    2735
    28 lib: $(PDWIN32_LIB)\$(TARGET).obj
    2936
     37# Lib rule - same as all.
     38lib: all
     39
     40
     41# Build objs and copies obj to lib.
     42$(PDWIN32_LIB)\$(TARGET).obj: $(OBJS)
     43    $(CP) $(OBJS) $(PDWIN32_LIB)
     44
     45
     46# Dep rule - makes depenencies for C, C++ and Asm files.
    3047dep:
    3148    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    3249        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    3350
    34 !ifndef NODEP
    35 !include .depend
    36 !endif
    3751
     52# Includes the common rules.
     53!include $(PDWIN32_INCLUDE)/pdwin32.post
    3854
    39 clean:
    40     $(RM) *.obj $(PDWIN32_LIB)\$(TARGET).obj *.pch
    41 
  • trunk/src/dplay/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.6 2000-02-09 23:46:55 bird Exp $
     1# $Id: makefile,v 1.7 2000-03-06 23:38:36 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       dplay.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = dplayrsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\dplay.obj \
     27$(OBJDIR)\dplayrsrc.obj \
     28$(PDWIN32_LIB)\dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = dplay
    2333
    24 OBJS =  dplay.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    25 
    26 all: $(TARGET).dll $(TARGET).lib
     34# All rule - build objs, target dll, copies dll to bin and makes libs.
     35all:    $(OBJDIR) \
     36        $(OBJDIR)\$(TARGET).dll \
     37        $(PDWIN32_BIN)\$(TARGET).dll \
     38        lib
    2739
    2840
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
    33           $(PDWIN32_LIB)/ole32.lib $(PDWIN32_LIB)/advapi32.lib
    34     $(CP) $@ $(PDWIN32_BIN)
     41# Lib rule - build importlibrary (and evt. other libs)
     42lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3543
    3644
    37 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    38 
    39 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    40     $(CP) $** $@
    41 
    42 $(TARGET).lib: $(TARGET)exp.def
    43     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    44     $(CP) $@ $(PDWIN32_LIB)
    45 
    46 $(TARGET)exp.def: $(TARGET).def
    47     $(IMPDEF) $** $@
    48 
    49 resource.asm: $(TARGET).rc
    50     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     45# Dll rule - builds the target dll.
     46$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     47    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    5148
    5249
     50# Linker file - creates the parameter file passed on to the linker.
     51$(OBJDIR)\$(TARGET).lrf: makefile
     52    @echo Creating file <<$@
     53/OUT:$(OBJDIR)\$(TARGET).dll
     54/MAP:$(OBJDIR)\$(TARGET).map
     55$(OBJS)
     56$(PDWIN32_LIB)/kernel32.lib
     57$(PDWIN32_LIB)/odincrt.lib
     58OS2386.LIB $(RTLLIB_O)
     59$(PDWIN32_LIB)/ole32.lib
     60$(PDWIN32_LIB)/advapi32.lib
     61$(TARGET).def
     62<<keep
     63
     64
     65# Dep rule - makes depenencies for C, C++ and Asm files.
    5366dep:
    5467    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5568        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5669
    57 !ifndef NODEP
    58 !include .depend
    59 !endif
    6070
     71# Includes the common rules.
     72!include $(PDWIN32_INCLUDE)/pdwin32.post
    6173
    62 clean:
    63     $(RM) *.obj *.lib *.dll *~ *.map *.pch \
    64         $(PDWIN32_BIN)\$(TARGET).dll \
    65         $(PDWIN32_LIB)\$(TARGET).lib \
    66         resource.asm $(TARGET)exp.def
    67 
  • trunk/src/dsound/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.16 2000-02-09 23:46:55 bird Exp $
     1# $Id: makefile,v 1.17 2000-03-06 23:38:37 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       dsound.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = dsoundrsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\dsound.obj \
     27$(OBJDIR)\os2dsound.obj \
     28$(OBJDIR)\initterm.obj \
     29$(OBJDIR)\os2sndbuffer.obj \
     30$(OBJDIR)\os2helper.obj \
     31$(OBJDIR)\dsoundrsrc.obj
     32
     33
     34# Target name - name of the dll without extention and path.
    2235TARGET = dsound
    2336
    24 OBJS =  dsound.obj os2dsound.obj initterm.obj os2sndbuffer.obj os2helper.obj resource.obj
    2537
    26 all: $(TARGET).dll $(TARGET).lib
     38# All rule - build objs, target dll, copies dll to bin and makes libs.
     39all:    $(OBJDIR) \
     40        $(OBJDIR)\$(TARGET).dll \
     41        $(PDWIN32_BIN)\$(TARGET).dll \
     42        lib
    2743
    2844
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33     $(CP) $@ $(PDWIN32_BIN)
     45# Lib rule - build importlibrary (and evt. other libs)
     46lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3447
    3548
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
    41 $(TARGET).lib: $(TARGET).def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    43     $(CP) $@ $(PDWIN32_LIB)
    44 
    45 resource.asm: $(TARGET).rc
    46     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     49# Dll rule - builds the target dll.
     50$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     51    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4752
    4853
     54# Linker file - creates the parameter file passed on to the linker.
     55$(OBJDIR)\$(TARGET).lrf: makefile
     56    @echo Creating file <<$@
     57/OUT:$(OBJDIR)\$(TARGET).dll
     58/MAP:$(OBJDIR)\$(TARGET).map
     59$(OBJS)
     60pmwinx.lib
     61$(PDWIN32_LIB)/kernel32.lib
     62$(PDWIN32_LIB)/odincrt.lib
     63OS2386.LIB
     64$(RTLLIB_O)
     65$(TARGET).def
     66<<keep
     67
     68
     69# Dep rule - makes depenencies for C, C++ and Asm files.
    4970dep:
    5071    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5172        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5273
    53 !ifndef NODEP
    54 !include .depend
    55 !endif
    5674
     75# Includes the common rules.
     76!include $(PDWIN32_INCLUDE)/pdwin32.post
    5777
    58 clean:
    59     $(RM) *.obj *.lib *.dll *.map *.pch \
    60         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    61         resource.asm $(TARGET)exp.def
    62 
  • trunk/src/gdi32/makefile

    r2802 r3031  
    1 # $Id: makefile,v 1.22 2000-02-16 14:18:10 sandervl Exp $
     1# $Id: makefile,v 1.23 2000-03-06 23:38:38 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       gdi32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = gdi32rsrc.asm
    2022
     23
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\gdi32.obj \
     27$(OBJDIR)\opengl.obj \
     28$(OBJDIR)\callback.obj \
     29$(OBJDIR)\dibsect.obj \
     30$(OBJDIR)\initterm.obj \
     31$(OBJDIR)\oslibgdi.obj \
     32$(OBJDIR)\font.obj \
     33$(OBJDIR)\text.obj \
     34$(OBJDIR)\palette.obj \
     35$(OBJDIR)\line.obj \
     36$(OBJDIR)\oslibgpi.obj \
     37$(OBJDIR)\region.obj \
     38$(OBJDIR)\metafile.obj \
     39$(OBJDIR)\dibitmap.obj \
     40$(OBJDIR)\blit.obj \
     41$(OBJDIR)\rgbcvt.obj \
     42$(OBJDIR)\dbglocal.obj \
     43$(OBJDIR)\gdi32rsrc.obj
     44
     45
     46# Target name - name of the dll without extention and path.
    2147TARGET = gdi32
    2248
    23 OBJS =  gdi32.obj opengl.obj callback.obj dibsect.obj initterm.obj resource.obj \
    24         oslibgdi.obj font.obj text.obj palette.obj line.obj oslibgpi.obj region.obj \
    25         metafile.obj dibitmap.obj blit.obj rgbcvt.obj dbglocal.obj
     49
     50# All rule - build objs, target dll, copies dll to bin and makes libs.
     51all:    $(OBJDIR) \
     52        $(OBJDIR)\$(TARGET).dll \
     53        $(PDWIN32_BIN)\$(TARGET).dll \
     54        lib
    2655
    2756
    28 all: $(TARGET).dll $(TARGET).lib
     57# Lib rule - build importlibrary (and evt. other libs)
     58lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    2959
    3060
    31 $(TARGET).dll: $(OBJS) $(TARGET).def
    32     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    33           $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/user32.lib \
    34           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    35     $(CP) $@ $(PDWIN32_BIN)
     61# Dll rule - builds the target dll.
     62$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     63    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    3664
    3765
    38 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    39 
    40 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    41     $(CP) $** $@
    42 
    43 $(TARGET).lib: $(TARGET)exp.def
    44     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    45     $(CP) $@ $(PDWIN32_LIB)
    46 
    47 $(TARGET)exp.def: $(TARGET).def
    48     $(IMPDEF) $** $@
     66# Linker file - creates the parameter file passed on to the linker.
     67$(OBJDIR)\$(TARGET).lrf: makefile
     68    @echo Creating file <<$@
     69/OUT:$(OBJDIR)\$(TARGET).dll
     70/MAP:$(OBJDIR)\$(TARGET).map
     71$(OBJS)
     72$(PDWIN32_LIB)/pmwinx.lib
     73$(PDWIN32_LIB)/kernel32.lib
     74$(PDWIN32_LIB)/user32.lib
     75$(PDWIN32_LIB)/odincrt.lib
     76OS2386.LIB
     77$(RTLLIB_O)
     78$(TARGET).def
     79<<keep
    4980
    5081
    51 resource.asm: gdi32.rc
    52     $(RC) $(RCFLAGS) -o resource.asm gdi32.rc
    53 
    54 
     82# Dep rule - makes depenencies for C, C++ and Asm files.
    5583dep:
    5684    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5785        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5886
    59 !ifndef NODEP
    60 !include .depend
    61 !endif
    6287
     88# Includes the common rules.
     89!include $(PDWIN32_INCLUDE)/pdwin32.post
    6390
    64 clean:
    65     $(RM) *.obj *.lib *.dll *.map *.pch resource.asm \
    66         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    67         $(TARGET)exp.def
    68 
  • trunk/src/imagehlp/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.8 2000-02-09 23:46:56 bird Exp $
     1# $Id: makefile,v 1.9 2000-03-06 23:38:39 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       imagehlp.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = imagehlprsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\imagehlp.obj \
     27$(OBJDIR)\internal.obj \
     28$(OBJDIR)\initterm.obj \
     29$(OBJDIR)\imagehlprsrc.obj
     30
     31
     32# Target name - name of the dll without extention and path.
    2233TARGET = imagehlp
    2334
    24 OBJS =  imagehlp.obj internal.obj initterm.obj resource.obj
    2535
    26 all: $(TARGET).dll $(TARGET).lib
     36# All rule - build objs, target dll, copies dll to bin and makes libs.
     37all:    $(OBJDIR) \
     38        $(OBJDIR)\$(TARGET).dll \
     39        $(PDWIN32_BIN)\$(TARGET).dll \
     40        lib
    2741
    2842
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33     $(CP) $@ $(PDWIN32_BIN)
     43# Lib rule - build importlibrary (and evt. other libs)
     44lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3445
    3546
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
    41 $(TARGET).lib: $(TARGET)exp.def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    43     $(CP) $@ $(PDWIN32_LIB)
    44 
    45 $(TARGET)exp.def: $(TARGET).def
    46     $(IMPDEF) $** $@
     47# Dll rule - builds the target dll.
     48$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     49    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4750
    4851
    49 resource.asm: $(TARGET).rc
    50     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     52# Linker file - creates the parameter file passed on to the linker.
     53$(OBJDIR)\$(TARGET).lrf: makefile
     54    @echo Creating file <<$@
     55/OUT:$(OBJDIR)\$(TARGET).dll
     56/MAP:$(OBJDIR)\$(TARGET).map
     57$(OBJS)
     58$(PDWIN32_LIB)/kernel32.lib
     59$(PDWIN32_LIB)/odincrt.lib
     60OS2386.LIB
     61$(RTLLIB_O)
     62$(TARGET).def
     63<<keep
    5164
    5265
     66# Dep rule - makes depenencies for C, C++ and Asm files.
    5367dep:
    5468    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5569        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5670
    57 !ifndef NODEP
    58 !include .depend
    59 !endif
    6071
     72# Includes the common rules.
     73!include $(PDWIN32_INCLUDE)/pdwin32.post
    6174
    62 clean:
    63     $(RM) *.obj *.lib *.dll *.map *.pch \
    64         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    65          resource.asm $(TARGET)exp.def
    66 
  • trunk/src/imm32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.8 2000-02-09 23:46:56 bird Exp $
     1# $Id: makefile,v 1.9 2000-03-06 23:38:40 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       imm32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = lz32rsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\imm32.obj \
     27$(OBJDIR)\imm32rsrc.obj \
     28$(PDWIN32_LIB)\dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = imm32
    2333
    24 OBJS =  imm32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2534
    26 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2740
    2841
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3444
    3545
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
    41 $(TARGET).lib: $(TARGET)exp.def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    43     $(CP) $@ $(PDWIN32_LIB)
    44 
    45 $(TARGET)exp.def: $(TARGET).def
    46     $(IMPDEF) $** $@
    47 
    48 resource.asm: $(TARGET).rc
    49     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    5049
    5150
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(TARGET).def
     58$(PDWIN32_LIB)/kernel32.lib
     59$(PDWIN32_LIB)/odincrt.lib
     60OS2386.LIB
     61$(RTLLIB_O)
     62$(TARGET).def
     63<<keep
     64
     65
     66# Dep rule - makes depenencies for C, C++ and Asm files.
    5267dep:
    5368    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5469        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5570
    56 !ifndef NODEP
    57 !include .depend
    58 !endif
    5971
     72# Includes the common rules.
     73!include $(PDWIN32_INCLUDE)/pdwin32.post
    6074
    61 clean:
    62     $(RM) *.obj *.lib *.dll *.map *.pch \
    63         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    64         resource.asm $(TARGET)exp.def
    65 
    66 
    67 
    68 
    69 
  • trunk/src/kernel32/makefile

    r3019 r3031  
    1 # $Id: makefile,v 1.87 2000-03-04 23:47:00 sandervl Exp $
     1# $Id: makefile,v 1.88 2000-03-06 23:34:18 bird Exp $
    22
    33#
     
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    14 #SvL: Remove this when everything has been converted to the new build rules
    15 NEWBUILD=1
    1615
     16# Compiler, tools, and interference rules.
    1717!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1818
    19 RESOURCES= kernelrsrc
    20 CFLAGS   = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    21 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
    2219
    23 !ifdef NODEBUGINFO
    24 CFLAGS = $(CFLAGS) -DDEFAULT_LOGGING_OFF
    25 CXXFLAGS = $(CXXFLAGS) -DDEFAULT_LOGGING_OFF
    26 !endif
     20# Flag overloads and local macros.
     21CLEANEXTRAS = kernelrsrc.asm
    2722
     23
     24# Object files. All objects should be prefixed with $(OBJDIR)!
    2825OBJS = \
    2926$(OBJDIR)\KERNEL32.OBJ \
     
    9895$(OBJDIR)\fileio.obj \
    9996$(OBJDIR)\hmtoken.obj \
    100 $(OBJDIR)\$(RESOURCES).obj \
    10197$(OBJDIR)\atom.obj \
    10298$(OBJDIR)\disk.obj \
     
    120116$(OBJDIR)\oslibdebug.obj \
    121117$(OBJDIR)\dbglocal.obj \
    122 $(OBJDIR)\registry.obj
     118$(OBJDIR)\registry.obj \
     119$(OBJDIR)\kernelrsrc.obj
    123120
     121
     122# Target name - name of the dll without extention and path.
    124123TARGET = kernel32
    125124
    126 all: $(OBJDIR) $(TARGET).dll $(TARGET).LIB
    127125
    128 $(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
    129         $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    130         rc -r console.rc console.res
    131         rc console.res $@
    132         $(CP) $@ $(PDWIN32_BIN)
     126# All rule - build objs, target dll, copies dll to bin and makes libs.
     127all:    $(OBJDIR) \
     128        $(OBJDIR)\$(TARGET).dll \
     129        $(PDWIN32_BIN)\$(TARGET).dll \
     130        lib
    133131
     132
     133# Lib rule - build importlibrary (and evt. other libs)
     134lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
     135
     136
     137# Dll rule - builds the target dll.
     138$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf \
     139                          $(OBJDIR)\console.res
     140    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
     141    $(OS2RC) $(OBJDIR)\console.res $@
     142
     143
     144# Linker file - creates the parameter file passed on to the linker.
    134145$(OBJDIR)\$(TARGET).lrf: makefile
    135         @echo Creating file <<$(OBJDIR)\$(@B).lrf
     146    @echo Creating file <<$(OBJDIR)\$(@B).lrf
     147/OUT:$(OBJDIR)\$(TARGET).dll
     148/MAP:$(OBJDIR)\$(TARGET).map
    136149$(OBJS)
    137150$(PDWIN32_LIB)\odincrt.lib
     
    144157<<keep
    145158
    146 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    147159
    148 $(RESOURCES).asm: kernel32.rc
    149     $(RC) $(RCFLAGS) -o $(RESOURCES).asm kernel32.rc
    150 
     160# Dep rule - makes depenencies for C, C++ and Asm files.
    151161dep:
    152162    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    153163        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    154164
     165
     166# Includes the common rules.
    155167!include $(PDWIN32_INCLUDE)/pdwin32.post
     168
  • trunk/src/lz32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.10 2000-02-09 23:46:58 bird Exp $
     1# $Id: makefile,v 1.11 2000-03-06 23:38:41 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       lz32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = lz32rsrc.asm
    2022
     23
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\lz32.obj \
     27$(OBJDIR)\lz32rsrc.obj \
     28$(PDWIN32_LIB)/dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2132TARGET = lz32
    2233
    23 OBJS =  lz32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2434
    25 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2640
    2741
    28 $(TARGET).dll: $(OBJS) $(TARGET)exp.def
    29     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) \
    30           $(PDWIN32_LIB)\odincrt.lib \
    31           $(PDWIN32_LIB)\kernel32.lib \
    32           os2386.lib \
    33           $(RTLLIB_O) \
    34           $(TARGET).def
    35     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3644
    3745
    38 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    39 
    40 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    41     $(CP) $** $@
    42 
    43 $(TARGET).lib: $(TARGET)exp.def
    44     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    45     $(CP) $@ $(PDWIN32_LIB)
    46 
    47 $(TARGET)exp.def: $(TARGET).def
    48     $(IMPDEF) $** $@
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4949
    5050
    51 resource.asm: $(TARGET).rc
    52     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)\odincrt.lib
     58$(PDWIN32_LIB)\kernel32.lib
     59os2386.lib
     60$(RTLLIB_O)
     61$(TARGET).def
     62<<keep
    5363
    5464
     65# Dep rule - makes depenencies for C, C++ and Asm files.
    5566dep:
    5667    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5768        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5869
    59 !ifndef NODEP
    60 !include .depend
    61 !endif
    6270
     71# Includes the common rules.
     72!include $(PDWIN32_INCLUDE)/pdwin32.post
    6373
    64 clean:
    65     $(RM) *exp.def *.obj *.lib *.dll *.map *.pch \
    66         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    67         resource.asm $(TARGET)exp.def
    68 
  • trunk/src/mpr/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.12 2000-02-09 23:46:58 bird Exp $
     1# $Id: makefile,v 1.13 2000-03-06 23:38:41 bird Exp $
    22
    33#
     
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
     19
     20# Flag overloads and local macros.
     21CLEANEXTRAS = mprrsrc.asm
    1722
    1823CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
     
    2025
    2126
     27# Object files. All objects should be prefixed with $(OBJDIR)!
     28OBJS = \
     29$(OBJDIR)\mpr.obj \
     30$(OBJDIR)\mprrsrc.obj \
     31$(PDWIN32_LIB)/dllentry.obj
     32
     33
     34# Target name - name of the dll without extention and path.
    2235TARGET = mpr
    2336
    24 OBJS =  mpr.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2537
    26 all: $(TARGET).dll $(TARGET).lib
     38# All rule - build objs, target dll, copies dll to bin and makes libs.
     39all:    $(OBJDIR) \
     40        $(OBJDIR)\$(TARGET).dll \
     41        $(PDWIN32_BIN)\$(TARGET).dll \
     42        lib
    2743
    2844
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
    33           OS2386.LIB $(RTLLIB_O)
    34     $(CP) $@ $(PDWIN32_BIN)
     45# Lib rule - build importlibrary (and evt. other libs)
     46lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3547
    3648
    37 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    38 
    39 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    40     $(CP) $** $@
    41 
    42 $(TARGET).lib: $(TARGET)exp.def
    43     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    44     $(CP) $@ $(PDWIN32_LIB)
    45 
    46 $(TARGET)exp.def: $(TARGET).def
    47     $(IMPDEF) $** $@
    48 
    49 resource.asm: $(TARGET).rc
    50     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     49# Dll rule - builds the target dll.
     50$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     51    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    5152
    5253
     54# Linker file - creates the parameter file passed on to the linker.
     55$(OBJDIR)\$(TARGET).lrf: makefile
     56    @echo Creating file <<$(OBJDIR)\$(@B).lrf
     57/OUT:$(OBJDIR)\$(TARGET).dll
     58/MAP:$(OBJDIR)\$(TARGET).map
     59$(OBJS)
     60$(PDWIN32_LIB)/kernel32.lib
     61$(PDWIN32_LIB)/user32.lib
     62$(PDWIN32_LIB)/odincrt.lib
     63OS2386.LIB
     64$(RTLLIB_O)
     65$(TARGET).def
     66<<keep
     67
     68
     69
     70# Dep rule - makes depenencies for C, C++ and Asm files.
    5371dep:
    5472    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5573        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5674
    57 !ifndef NODEP
    58 !include .depend
    59 !endif
     75# Includes the common rules.
     76!include $(PDWIN32_INCLUDE)/pdwin32.post
    6077
    61 
    62 clean:
    63     $(RM) *.obj *.lib *.dll *~ *.map *.pch \
    64         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    65         resource.asm $(TARGET)exp.def
    66 
  • trunk/src/msacm32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.9 2000-02-09 23:46:58 bird Exp $
     1# $Id: makefile,v 1.10 2000-03-06 23:38:43 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       msacm32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = msacm32rsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\msacm32.obj \
     27$(OBJDIR)\filter.obj \
     28$(OBJDIR)\format.obj \
     29$(OBJDIR)\internal.obj \
     30$(OBJDIR)\stream.obj \
     31$(OBJDIR)\driver.obj \
     32$(OBJDIR)\initterm.obj \
     33$(OBJDIR)\msacm32rsrc.obj
     34
     35
     36# Target name - name of the dll without extention and path.
    2237TARGET = msacm32
    2338
    24 OBJS =  msacm32.obj filter.obj format.obj internal.obj \
    25         stream.obj driver.obj  initterm.obj resource.obj
    2639
    27 all: $(TARGET).dll $(TARGET).lib
     40# All rule - build objs, target dll, copies dll to bin and makes libs.
     41all:    $(OBJDIR) \
     42        $(OBJDIR)\$(TARGET).dll \
     43        $(PDWIN32_BIN)\$(TARGET).dll \
     44        lib
    2845
    2946
    30 $(TARGET).dll: $(OBJS) $(TARGET).def
    31     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    32           $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
    33           $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/winmm.lib \
    34           $(PDWIN32_LIB)/advapi32.lib \
    35           OS2386.LIB $(RTLLIB_O)
    36     $(CP) $@ $(PDWIN32_BIN)
     47# Lib rule - build importlibrary (and evt. other libs)
     48lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3749
    3850
    39 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    40 
    41 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    42     $(CP) $** $@
    43 
    44 $(TARGET).lib: $(TARGET)exp.def
    45     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    46     $(CP) $@ $(PDWIN32_LIB)
    47 
    48 $(TARGET)exp.def: $(TARGET).def
    49     $(IMPDEF) $** $@
    50 
    51 resource.asm: $(TARGET).rc
    52     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     51# Dll rule - builds the target dll.
     52$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     53    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    5354
    5455
     56# Linker file - creates the parameter file passed on to the linker.
     57$(OBJDIR)\$(TARGET).lrf: makefile
     58    @echo Creating file <<$@
     59/OUT:$(OBJDIR)\$(TARGET).dll
     60/MAP:$(OBJDIR)\$(TARGET).map
     61$(OBJS)
     62$(PDWIN32_LIB)/pmwinx.lib
     63$(PDWIN32_LIB)/kernel32.lib
     64$(PDWIN32_LIB)/odincrt.lib
     65$(PDWIN32_LIB)/winmm.lib
     66$(PDWIN32_LIB)/advapi32.lib
     67OS2386.LIB
     68$(RTLLIB_O)
     69$(TARGET).def
     70<<keep
     71
     72
     73# Dep rule - makes depenencies for C, C++ and Asm files.
    5574dep:
    5675    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5776        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5877
    59 !ifndef NODEP
    60 !include .depend
    61 !endif
    6278
     79# Includes the common rules.
     80!include $(PDWIN32_INCLUDE)/pdwin32.post
    6381
    64 clean:
    65     $(RM) *.obj *.lib *.dll *.map *.pch \
    66         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    67         resource.asm $(TARGET)exp.def
    68 
    69 
    70 
    71 
    72 
  • trunk/src/msvcrt/makefile

    r2723 r3031  
    1 # $Id: makefile,v 1.13 2000-02-10 01:01:39 bird Exp $
     1# $Id: makefile,v 1.14 2000-03-06 23:38:46 bird Exp $
    22
    33#
     
    66#       msvcrt.dll makefile
    77#
     8
     9# Kso: not converted.
     10OLDBUILD = 1
    811
    912PDWIN32_INCLUDE = ..\..\include
  • trunk/src/msvfw32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.7 2000-02-09 23:46:58 bird Exp $
     1# $Id: makefile,v 1.8 2000-03-06 23:38:49 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       msvfw32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
     15
     16# Compiler, tools, and interference rules.
    1417!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1518
    1619
    17 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    18 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = msvfw32rsrc.asm
    1922
    2023
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\msvfw32.obj \
     27$(OBJDIR)\msvfw32rsrc.obj \
     28$(PDWIN32_LIB)/dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2132TARGET = msvfw32
    2233
    23 OBJS =  msvfw32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2434
    25 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2640
    2741
    28 $(TARGET).dll: $(OBJS) $(TARGET).def
    29     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    30           $(PDWIN32_LIB)/kernel32.lib \
    31           $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/gdi32.lib \
    32           $(PDWIN32_LIB)/winmm.lib \
    33           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    34     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3544
    3645
    37 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    38 
    39 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    40     $(CP) $** $@
    41 
    42 $(TARGET).lib: $(TARGET)exp.def
    43     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    44     $(CP) $@ $(PDWIN32_LIB)
    45 
    46 $(TARGET)exp.def: $(TARGET).def
    47     $(IMPDEF) $** $@
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4849
    4950
    50 resource.asm: $(TARGET).rc
    51     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$(OBJDIR)\$(@B).lrf
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)/kernel32.lib
     58$(PDWIN32_LIB)/user32.lib
     59$(PDWIN32_LIB)/gdi32.lib
     60$(PDWIN32_LIB)/winmm.lib
     61$(PDWIN32_LIB)/odincrt.lib
     62OS2386.LIB
     63$(RTLLIB_O)
     64$(TARGET).def
     65<<keep
    5266
    5367
     68# Dep rule - makes depenencies for C, C++ and Asm files.
    5469dep:
    5570    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5671        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5772
    58 !ifndef NODEP
    59 !include .depend
    60 !endif
    6173
     74# Includes the common rules.
     75!include $(PDWIN32_INCLUDE)/pdwin32.post
    6276
    63 clean:
    64     $(RM) *.obj *.lib *.dll *.map *.pch \
    65         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    66         resource.asm $(TARGET)exp.def
    67 
    68 
    69 
    70 
    71 
    72 
  • trunk/src/odincrt/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.16 2000-02-09 23:46:59 bird Exp $
     1# $Id: makefile,v 1.17 2000-03-06 23:38:49 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       odincrt.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
     15
     16# Compiler, tools, and interference rules.
    1417!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1518
    16 CXXFLAGS = $(CXXFLAGS_ODINCRT) -I$(PDWIN32_INCLUDE)
     19
     20# Flag overloads and local macros.
     21CLEANEXTRAS = lz32rsrc.asm
     22NOTEXPDEF   = 1
     23
     24CXXFLAGS    = $(CXXFLAGS_ODINCRT)
    1725IMPLIBFLAGS = $(IMPLIBFLAGS) /NOIgnoreCase
    1826
     27!ifdef VAC36
     28RUNTIMELIBDEF   = odin36.def
     29!else
     30RUNTIMELIBDEF   = odincrt.def
     31!endif
     32
     33
     34# Object files. All objects should be prefixed with $(OBJDIR)!
     35OBJS = \
     36$(OBJDIR)\odincrt.obj \
     37$(OBJDIR)\initterm.obj \
     38$(OBJDIR)\malloc.obj \
     39$(OBJDIR)\string.obj \
     40$(OBJDIR)\file.obj
     41
     42
     43# Target name - name of the dll without extention and path.
    1944TARGET = odincrt
    2045
    21 !ifdef VAC36
    22 RUNTIMELIBDEF=odin36.def
    23 !else
    24 RUNTIMELIBDEF=odincrt.def
    25 !endif
    2646
    27 OBJS =  odincrt.obj initterm.obj malloc.obj string.obj file.obj
     47# All rule - build objs, target dll, copies dll to bin and makes libs.
     48all:    $(OBJDIR) \
     49        $(OBJDIR)\$(TARGET).dll \
     50        $(PDWIN32_BIN)\$(TARGET).dll \
     51        lib
    2852
    29 all: $(TARGET).dll $(TARGET).lib
    30 
    31 $(TARGET).dll: $(OBJS) $(RUNTIMELIBDEF)
    32     $(LD) $(LDFLAGS_ODINCRT) -Fm -Fe$@ $(OBJS) $(RUNTIMELIBDEF) $(SOMLIB)
    33     $(CP) $@ $(PDWIN32_BIN)
     53# Lib rule - build importlibrary (and evt. other libs)
     54lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3455
    3556
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
     57# ImpLib rule - build importlibrary (and evt. other libs)
    4158$(TARGET).lib: $(TARGET).def
    4259    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    43     $(CP) $@ $(PDWIN32_LIB)
    4460
    4561
     62# Dll rule - builds the target dll.
     63$(OBJDIR)\$(TARGET).dll: $(OBJS) $(RUNTIMELIBDEF) $(OBJDIR)\$(TARGET).lrf
     64    $(LD2) $(LD2FLAGS_ODINCRT) @$(OBJDIR)\$(TARGET).lrf
     65
     66
     67# Linker file - creates the parameter file passed on to the linker.
     68$(OBJDIR)\$(TARGET).lrf: makefile
     69    @echo Creating file <<$@
     70/OUT:$(OBJDIR)\$(TARGET).dll
     71/MAP:$(OBJDIR)\$(TARGET).map
     72$(OBJS)
     73$(RUNTIMELIBDEF)
     74<<keep
     75
     76
     77# Dep rule - makes depenencies for C, C++ and Asm files.
    4678dep:
    4779    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    4880        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    4981
    50 !ifndef NODEP
    51 !include .depend
    52 !endif
    5382
     83# Includes the common rules.
     84!include $(PDWIN32_INCLUDE)/pdwin32.post
    5485
    55 clean:
    56     $(RM) *.obj *.lib *.dll *.map *.pch \
    57         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib
    58 
  • trunk/src/ole32/makefile

    r2722 r3031  
    1 # $Id: makefile,v 1.21 2000-02-10 00:54:51 bird Exp $
     1# $Id: makefile,v 1.22 2000-03-06 23:38:50 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       ole32.dll makefile
    77#
    88
     9
     10# Directory macros.
    911PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     12PDWIN32_LIB     = ..\..\lib
     13PDWIN32_BIN     = ..\..\$(OBJDIR)
     14PDWIN32_TOOLS   = ..\..\tools\bin
    1315
    1416
     17# Compiler, tools, and interference rules.
    1518!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1619
    1720
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     21# Flag overloads and local macros.
     22CLEANEXTRAS = ole32rsrc.asm $(PDWIN32_BIN)\regsvr32.exe
    2023
    2124
    22 TARGET = ole32os2
    23 ORGTARGET = ole32
    24 
    25 OBJS =  ole32.obj \
    26         antimoniker.obj \
    27         bindctx.obj \
    28         clsid.obj \
    29         compositemoniker.obj \
    30         datacache.obj \
    31         defaulthandler.obj \
    32         filemoniker.obj \
    33         guid.obj \
    34         hglobalstream.obj \
    35         initialise.obj \
    36         itemmoniker.obj \
    37         iunknown.obj \
    38         library.obj \
    39         memlockbytes.obj \
    40         moniker.obj \
    41         oString.obj \
    42         ole2.obj \
    43         oleobj.obj \
    44         oleClip.obj \
    45         oleDrag.obj \
    46         oleMenu.obj \
    47         stg_bigblockfile.obj \
    48         stg_stream.obj \
    49         storage.obj \
    50         stubs.obj \
    51         taskmem.obj resource.obj  $(PDWIN32_LIB)/dllentry.obj
    52 
    53 all: $(TARGET).dll $(ORGTARGET).lib regsvr32.exe
     25# Object files. All objects should be prefixed with $(OBJDIR)!
     26OBJS = \
     27$(OBJDIR)\ole32.obj \
     28$(OBJDIR)\antimoniker.obj \
     29$(OBJDIR)\bindctx.obj \
     30$(OBJDIR)\clsid.obj \
     31$(OBJDIR)\compositemoniker.obj \
     32$(OBJDIR)\datacache.obj \
     33$(OBJDIR)\defaulthandler.obj \
     34$(OBJDIR)\filemoniker.obj \
     35$(OBJDIR)\guid.obj \
     36$(OBJDIR)\hglobalstream.obj \
     37$(OBJDIR)\initialise.obj \
     38$(OBJDIR)\itemmoniker.obj \
     39$(OBJDIR)\iunknown.obj \
     40$(OBJDIR)\library.obj \
     41$(OBJDIR)\memlockbytes.obj \
     42$(OBJDIR)\moniker.obj \
     43$(OBJDIR)\oString.obj \
     44$(OBJDIR)\ole2.obj \
     45$(OBJDIR)\oleobj.obj \
     46$(OBJDIR)\oleClip.obj \
     47$(OBJDIR)\oleDrag.obj \
     48$(OBJDIR)\oleMenu.obj \
     49$(OBJDIR)\stg_bigblockfile.obj \
     50$(OBJDIR)\stg_stream.obj \
     51$(OBJDIR)\storage.obj \
     52$(OBJDIR)\stubs.obj \
     53$(OBJDIR)\taskmem.obj \
     54$(OBJDIR)\ole32rsrc.obj \
     55$(PDWIN32_LIB)\dllentry.obj
    5456
    5557
    56 $(TARGET).dll: $(OBJS) $(ORGTARGET).def
    57     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(ORGTARGET).def \
    58           $(PDWIN32_LIB)\user32.lib \
    59           $(PDWIN32_LIB)\gdi32.lib \
    60           $(PDWIN32_LIB)\comctl32.lib \
    61           $(PDWIN32_LIB)\advapi32.lib \
    62           $(PDWIN32_LIB)\kernel32.lib \
    63           $(PDWIN32_LIB)\oleaut32.lib \
    64           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    65     $(CP) $@ $(PDWIN32_BIN)
     58# Target and original target names - names of the dll without extention and path
     59TARGET      = ole32os2
     60ORGTARGET   = ole32
    6661
    6762
     63# All rule - build objs, target dll, copies dll to bin and makes libs.
     64all:    $(OBJDIR) \
     65        $(OBJDIR)\$(TARGET).dll \
     66        $(PDWIN32_BIN)\$(TARGET).dll \
     67        lib \
     68        $(OBJDIR)\regsvr32.exe \
     69        $(PDWIN32_BIN)\regsvr32.exe
     70
     71
     72# Lib rule - build importlibrary (and evt. other libs)
    6873lib: $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
    6974
    70 $(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
    71     $(CP) $** $@
    7275
    73 $(ORGTARGET).lib: $(ORGTARGET)exp.def
    74     $(IMPLIB) $(IMPLIBFLAGS) $@ $(ORGTARGET)exp.def
    75     $(CP) $@ $(PDWIN32_LIB)
    76 
    77 $(ORGTARGET)exp.def: $(ORGTARGET).def
    78     $(IMPDEF) $** $@
     76# Dll rule - builds the target dll.
     77$(OBJDIR)\$(TARGET).dll: $(OBJS) $(ORGTARGET).def $(OBJDIR)\$(TARGET).lrf
     78    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    7979
    8080
    81 resource.asm: $(ORGTARGET).rc
    82     $(RC) $(RCFLAGS) -o resource.asm $(ORGTARGET).rc
     81# Linker file - creates the parameter file passed on to the linker.
     82$(OBJDIR)\$(TARGET).lrf: makefile
     83    @echo Creating file <<$@
     84/OUT:$(OBJDIR)\$(TARGET).dll
     85/MAP:$(OBJDIR)\$(TARGET).map
     86$(OBJS)
     87$(PDWIN32_LIB)/user32.lib
     88$(PDWIN32_LIB)/gdi32.lib
     89$(PDWIN32_LIB)/comctl32.lib
     90$(PDWIN32_LIB)/advapi32.lib
     91$(PDWIN32_LIB)/kernel32.lib
     92$(PDWIN32_LIB)/oleaut32.lib
     93$(PDWIN32_LIB)/odincrt.lib
     94OS2386.LIB
     95$(RTLLIB_O)
     96$(ORGTARGET).def
     97<<keep
    8398
    8499
    85 regsvr32.obj:   regsvr32.cpp
    86     $(CC) -C $(CXXFLAGS) -Ge+ -Tm+ regsvr32.cpp
    87100
    88 regsvr32.exe:   regsvr32.obj regsvr32.def \
     101#
     102# Regsrv32.exe rules.
     103#
     104$(OBJDIR)\regsvr32.obj:   regsvr32.cpp
     105    $(CC) -C $(CXXFLAGS) -Ge+ -Tm+ -Fo$@ regsvr32.cpp
     106
     107$(OBJDIR)\regsvr32.exe:   $(OBJDIR)\regsvr32.obj regsvr32.def \
    89108                $(PDWIN32_LIB)/user32.lib \
    90109                $(PDWIN32_LIB)/kernel32.lib \
    91110                $(PDWIN32_LIB)/ole32.lib
    92111    $(LD) $(LDFLAGS) -Ge+ -Fm -Fe$@ $** \
    93             $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    94     $(CP) $@ $(PDWIN32_BIN)
     112        $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
     113
     114$(PDWIN32_BIN)\regsvr32.exe: $(OBJDIR)\regsvr32.exe
     115    $(CP) $** $@
    95116
    96117
     118# Dep rule - makes depenencies for C, C++ and Asm files.
    97119dep:
    98120    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    99121        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    100122
    101 !ifndef NODEP
    102 !include .depend
    103 !endif
    104123
     124# Includes the common rules.
     125!include $(PDWIN32_INCLUDE)/pdwin32.post
    105126
    106 clean:
    107     $(RM) *.obj *.lib *.dll *.map *.pch *.exe \
    108         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    109         $(PDWIN32_BIN)\regsvr32.exe resource.asm $(TARGET)exp.def
    110 
  • trunk/src/oleaut32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.16 2000-02-09 23:46:59 bird Exp $
     1# $Id: makefile,v 1.17 2000-03-06 23:38:51 bird Exp $
     2
    23#
    3 # PD-Win32 API
     4# Odin32 API
    45#
    56#       ole32.dll makefile
    67#
    78
     9# Directory macros.
    810PDWIN32_INCLUDE = ..\..\include
    9 PDWIN32_LIB = ..\..\lib
    10 PDWIN32_BIN = ..\..\bin
    11 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1214
    1315
     16# Compiler, tools, and interference rules.
    1417!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1518
    1619
    17 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    18 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = oleaut32rsrc.asm
    1922
    2023!ifdef NODEBUGINFO
     
    2326!endif
    2427
    25 TARGET = olautos2
    26 ORGTARGET = oleaut32
    2728
    28 OBJS =  oleaut32.obj guid.obj \
    29         oList.obj \
    30         initterm.obj olefont.obj \
    31         variant.obj \
    32         ole2disp.obj parsedt.obj \
    33         iPicture.obj \
    34         iPictureNone.obj \
    35         iPictureBmp.obj \
    36         iPictureMeta.obj \
    37         iPictureIcon.obj \
    38         iPictureEmf.obj \
    39         typelib.obj \
    40         itypelib.obj \
    41         itypeinfo.obj \
    42         hash.obj \
    43         safearray.obj stubs.obj resource.obj
    44 
    45 all: $(TARGET).dll $(ORGTARGET).lib
     29# Object files. All objects should be prefixed with $(OBJDIR)!
     30OBJS = \
     31$(OBJDIR)\oleaut32.obj \
     32$(OBJDIR)\guid.obj \
     33$(OBJDIR)\oList.obj \
     34$(OBJDIR)\initterm.obj \
     35$(OBJDIR)\olefont.obj \
     36$(OBJDIR)\variant.obj \
     37$(OBJDIR)\ole2disp.obj \
     38$(OBJDIR)\parsedt.obj \
     39$(OBJDIR)\iPicture.obj \
     40$(OBJDIR)\iPictureNone.obj \
     41$(OBJDIR)\iPictureBmp.obj \
     42$(OBJDIR)\iPictureMeta.obj \
     43$(OBJDIR)\iPictureIcon.obj \
     44$(OBJDIR)\iPictureEmf.obj \
     45$(OBJDIR)\typelib.obj \
     46$(OBJDIR)\itypelib.obj \
     47$(OBJDIR)\itypeinfo.obj \
     48$(OBJDIR)\hash.obj \
     49$(OBJDIR)\safearray.obj \
     50$(OBJDIR)\stubs.obj \
     51$(OBJDIR)\oleaut32rsrc.obj
    4652
    4753
    48 $(TARGET).dll: $(OBJS) $(ORGTARGET).def
    49     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(ORGTARGET).def \
    50           $(PDWIN32_LIB)\pmwinx.lib \
    51           $(PDWIN32_LIB)\advapi32.lib \
    52           $(PDWIN32_LIB)\kernel32.lib \
    53           $(PDWIN32_LIB)\user32.lib \
    54           $(PDWIN32_LIB)\ole32.lib \
    55           $(PDWIN32_LIB)\gdi32.lib \
    56           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    57     $(CP) $@ $(PDWIN32_BIN)
     54# Target and original target names - names of the dll without extention and path
     55TARGET      = olautos2
     56ORGTARGET   = oleaut32
    5857
    5958
     59# All rule - build objs, target dll, copies dll to bin and makes libs.
     60all:    $(OBJDIR) \
     61        $(OBJDIR)\$(TARGET).dll \
     62        $(PDWIN32_BIN)\$(TARGET).dll \
     63        lib
    6064
     65
     66# Lib rule - build importlibrary (and evt. other libs)
    6167lib: $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
    6268
    63 $(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
    64     $(CP) $** $@
    6569
    66 $(ORGTARGET).lib: $(ORGTARGET)exp.def
    67     $(IMPLIB) $(IMPLIBFLAGS) $@ $(ORGTARGET)exp.def
    68     $(CP) $@ $(PDWIN32_LIB)
    69 
    70 $(ORGTARGET)exp.def: $(ORGTARGET).def
    71     $(IMPDEF) $** $@
     70# Dll rule - builds the target dll.
     71$(OBJDIR)\$(TARGET).dll: $(OBJS) $(ORGTARGET).def $(OBJDIR)\$(TARGET).lrf
     72    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    7273
    7374
    74 resource.asm: $(ORGTARGET).rc
    75     $(RC) $(RCFLAGS) -o resource.asm $(ORGTARGET).rc
     75# Linker file - creates the parameter file passed on to the linker.
     76$(OBJDIR)\$(TARGET).lrf: makefile
     77    @echo Creating file <<$@
     78/OUT:$(OBJDIR)\$(TARGET).dll
     79/MAP:$(OBJDIR)\$(TARGET).map
     80$(OBJS)
     81$(PDWIN32_LIB)/pmwinx.lib
     82$(PDWIN32_LIB)/advapi32.lib
     83$(PDWIN32_LIB)/kernel32.lib
     84$(PDWIN32_LIB)/user32.lib
     85$(PDWIN32_LIB)/ole32.lib
     86$(PDWIN32_LIB)/gdi32.lib
     87$(PDWIN32_LIB)/odincrt.lib
     88OS2386.LIB
     89$(RTLLIB_O)
     90$(ORGTARGET).def
     91<<keep
    7692
    7793
     94# Dep rule - makes depenencies for C, C++ and Asm files.
    7895dep:
    7996    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    8097        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    8198
    82 !ifndef NODEP
    83 !include .depend
    84 !endif
    8599
     100# Includes the common rules.
     101!include $(PDWIN32_INCLUDE)/pdwin32.post
    86102
    87 clean:
    88     $(RM) *.obj *.lib *.dll *.map *.pch \
    89         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(ORGTARGET).lib \
    90         resource.asm $(ORGTARGET)exp.def
    91 
  • trunk/src/olecli32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.8 2000-02-09 23:47:00 bird Exp $
     1# $Id: makefile,v 1.9 2000-03-06 23:38:51 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       olecli32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = olecli32rsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\olecli32.obj \
     27$(OBJDIR)\olecli32rsrc.obj \
     28$(PDWIN32_LIB)\dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = olecli32
    2333
    24 OBJS =  olecli32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2534
    26 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2740
    2841
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3444
    3545
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
    41 $(TARGET).lib: $(TARGET)exp.def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    43     $(CP) $@ $(PDWIN32_LIB)
    44 
    45 $(TARGET)exp.def: $(TARGET).def
    46     $(IMPDEF) $** $@
    47 
    48 resource.asm: $(TARGET).rc
    49     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    5049
    5150
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)/kernel32.lib
     58$(PDWIN32_LIB)/odincrt.lib
     59OS2386.LIB
     60$(RTLLIB_O)
     61$(TARGET).def
     62<<keep
     63
     64
     65# Dep rule - makes depenencies for C, C++ and Asm files.
    5266dep:
    5367    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5468        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5569
    56 !ifndef NODEP
    57 !include .depend
    58 !endif
    5970
     71# Includes the common rules.
     72!include $(PDWIN32_INCLUDE)/pdwin32.post
    6073
    61 clean:
    62     $(RM) *.obj *.lib *.dll *.map *.pch \
    63         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    64         resource.asm $(TARGET)exp.def
    65 
  • trunk/src/oledlg/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.8 2000-02-09 23:47:00 bird Exp $
     1# $Id: makefile,v 1.9 2000-03-06 23:38:52 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       oledlg.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = oledlgrsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\oledlg.obj \
     27$(OBJDIR)\oledlgrsrc.obj \
     28$(PDWIN32_LIB)\dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = oledlg
    2333
    24 OBJS =  oledlg.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2534
    26 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2740
    2841
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3444
    3545
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
    41 $(TARGET).lib: $(TARGET)exp.def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    43     $(CP) $@ $(PDWIN32_LIB)
    44 
    45 $(TARGET)exp.def: $(TARGET).def
    46     $(IMPDEF) $** $@
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4749
    4850
    49 resource.asm: $(TARGET).rc
    50     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)/kernel32.lib
     58$(PDWIN32_LIB)/odincrt.lib
     59OS2386.LIB
     60$(RTLLIB_O)
     61$(TARGET).def
     62<<keep
    5163
    5264
     65# Dep rule - makes depenencies for C, C++ and Asm files.
    5366dep:
    5467    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5568        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5669
    57 !ifndef NODEP
    58 !include .depend
    59 !endif
    6070
     71# Includes the common rules.
     72!include $(PDWIN32_INCLUDE)/pdwin32.post
    6173
    62 clean:
    63     $(RM) *.obj *.lib *.dll *.map *.pch \
    64         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    65         resource.asm $(TARGET)exp.def
    66 
  • trunk/src/olepro32/makefile

    r2842 r3031  
    1 # $Id: makefile,v 1.1 2000-02-21 10:33:00 sandervl Exp $
     1# $Id: makefile,v 1.2 2000-03-06 23:38:53 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       olepro32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = olepro32rsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\olepro32.obj \
     27$(OBJDIR)\olepro32rsrc.obj \
     28$(PDWIN32_LIB)\dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = olepro32
    2333
    24 OBJS =  olepro32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2534
    26 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2740
    2841
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/oleaut32.lib \
    32           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3444
    3545
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
    41 $(TARGET).lib: $(TARGET)exp.def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    43     $(CP) $@ $(PDWIN32_LIB)
    44 
    45 $(TARGET)exp.def: $(TARGET).def
    46     $(IMPDEF) $** $@
    47 
    48 resource.asm: $(TARGET).rc
    49     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    5049
    5150
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)/kernel32.lib
     58$(PDWIN32_LIB)/oleaut32.lib
     59$(PDWIN32_LIB)/odincrt.lib
     60OS2386.LIB
     61$(RTLLIB_O)
     62$(TARGET).def
     63<<keep
     64
     65
     66# Dep rule - makes depenencies for C, C++ and Asm files.
    5267dep:
    5368    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5469        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5570
    56 !ifndef NODEP
    57 !include .depend
    58 !endif
    5971
     72# Includes the common rules.
     73!include $(PDWIN32_INCLUDE)/pdwin32.post
    6074
    61 clean:
    62     $(RM) *.obj *.lib *.dll *.map *.pch \
    63         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    64         resource.asm $(TARGET)exp.def
    65 
  • trunk/src/olesvr32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.8 2000-02-09 23:47:00 bird Exp $
     1# $Id: makefile,v 1.9 2000-03-06 23:38:54 bird Exp $
    22
    33#
     
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = olesvr32rsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\olesvr32.obj \
     27$(OBJDIR)\olesvr32rsrc.obj \
     28$(PDWIN32_LIB)/dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = olesvr32
    2333
    24 OBJS =  olesvr32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2534
    26 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2740
    2841
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3444
    3545
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
    41 $(TARGET).lib: $(TARGET)exp.def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    43     $(CP) $@ $(PDWIN32_LIB)
    44 
    45 $(TARGET)exp.def: $(TARGET).def
    46     $(IMPDEF) $** $@
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4749
    4850
    49 resource.asm: $(TARGET).rc
    50     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)/kernel32.lib
     58$(PDWIN32_LIB)/odincrt.lib
     59OS2386.LIB
     60$(RTLLIB_O)
     61$(TARGET).def
     62<<keep
    5163
    5264
     65# Dep rule - makes depenencies for C, C++ and Asm files.
    5366dep:
    5467    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5568        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5669
    57 !ifndef NODEP
    58 !include .depend
    59 !endif
    6070
     71# Includes the common rules.
     72!include $(PDWIN32_INCLUDE)/pdwin32.post
    6173
    62 clean:
    63     $(RM) *.obj *.lib *.dll *.map *.pch \
    64         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    65         resource.asm $(TARGET)exp.def
    66 
  • trunk/src/opengl/glide/cvg/glide/makefile

    r2959 r3031  
    1 # $Id: makefile,v 1.2 2000-03-01 14:26:49 sandervl Exp $
     1# $Id: makefile,v 1.3 2000-03-06 23:33:43 bird Exp $
     2
    23#
    3 # PD-Win32 API
     4# Odin32 API
    45#
    56#       Glide makefile
    67#
    78
     9# Directory macros.
    810PDWIN32_INCLUDE = ..\..\..\..\..\include
    9 PDWIN32_LIB = ..\..\..\..\..\lib
    10 PDWIN32_BIN = ..\..\..\..\..\bin
    11 PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
     11PDWIN32_LIB     = ..\..\..\..\..\lib
     12PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
    1214
    13 TARGET=glide
     15# Local cleanup only.
     16LOCALCLEAN = 1
    1417
     18
     19# Compiler, tools, and interference rules.
    1520!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1621!include ..\3dfx.mak
    1722
    18 CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\texus;..\..\swlibs\pcilib;$(PDWIN32_INCLUDE)
    1923
    20 CFLAGS = $(CFLAGS) $(CINCLUDE) /Os-
     24# Flag overloads and local macros.
     25CLEANEXTRAS = glidersrc.asm
     26
     27CINCLUDE = -I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\texus;..\..\swlibs\pcilib;
     28CFLAGS   = $(CFLAGS) $(CINCLUDE) /Os-
    2129CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) /Os-
    22 
    23 OBJS =  CPUDTECT.OBJ    DDGUMP.OBJ      DIGLIDE.OBJ     DIGUTEX.OBJ     DISST.OBJ \
    24         DITEX.OBJ       G3DF.OBJ        GAA.OBJ         GBANNER.OBJ \
    25         GDRAW.OBJ       GERROR.OBJ      GGLIDE.OBJ      GLFB.OBJ        GMOVIE.OBJ \
    26         GPCI.OBJ        GSPLASH.OBJ     GSST.OBJ        GTEX.OBJ        GTEXDL.OBJ \
    27         GU.OBJ          GUCLIP.OBJ      GUMP.OBJ        GUTEX.OBJ       GXDRAW.OBJ \
    28         P6FENCE.OBJ     FIFO.OBJ
     30RCFLAGS  = $(RCFLAGS) $(CINCLUDE)
    2931
    3032
    31 all: $(TARGET).lib
     33# Object files. All objects should be prefixed with $(OBJDIR)!
     34OBJS = \
     35$(OBJDIR)\CPUDTECT.OBJ \
     36$(OBJDIR)\DDGUMP.OBJ \
     37$(OBJDIR)\DIGLIDE.OBJ \
     38$(OBJDIR)\DIGUTEX.OBJ \
     39$(OBJDIR)\DISST.OBJ \
     40$(OBJDIR)\DITEX.OBJ \
     41$(OBJDIR)\G3DF.OBJ \
     42$(OBJDIR)\GAA.OBJ \
     43$(OBJDIR)\GBANNER.OBJ \
     44$(OBJDIR)\GDRAW.OBJ \
     45$(OBJDIR)\GERROR.OBJ \
     46$(OBJDIR)\GGLIDE.OBJ \
     47$(OBJDIR)\GLFB.OBJ \
     48$(OBJDIR)\GMOVIE.OBJ \
     49$(OBJDIR)\GPCI.OBJ \
     50$(OBJDIR)\GSPLASH.OBJ \
     51$(OBJDIR)\GSST.OBJ \
     52$(OBJDIR)\GTEX.OBJ \
     53$(OBJDIR)\GTEXDL.OBJ \
     54$(OBJDIR)\GU.OBJ \
     55$(OBJDIR)\GUCLIP.OBJ \
     56$(OBJDIR)\GUMP.OBJ \
     57$(OBJDIR)\GUTEX.OBJ \
     58$(OBJDIR)\GXDRAW.OBJ \
     59$(OBJDIR)\P6FENCE.OBJ \
     60$(OBJDIR)\FIFO.OBJ \
     61$(OBJDIR)\glidersrc.obj
    3262
    33 $(TARGET).lib: $(OBJS)
    34         $(RM) $(TARGET).lib
    35         $(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
    3663
     64# Target name - name of the library without extention and path.
     65TARGET  = glide
     66
     67
     68# All rule - build objs and target library.
     69all:    $(OBJDIR) \
     70        $(OBJDIR)\$(TARGET).lib
     71
     72
     73# Create all libraries (not importlibraries)
     74libs: all
     75
     76
     77# Lib rule - build importlibrary (and evt. other libs)
     78$(OBJDIR)\$(TARGET).lib: $(OBJS)
     79    $(RM) $@
     80    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
     81
     82
     83# Dep rule - makes depenencies for C, C++ and Asm files.
    3784dep:
    3885    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
    3986        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
    40         ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\init\initvg\*.h ..\init\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h 
     87        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\init\initvg\*.h ..\init\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h
    4188
    42 !ifndef NODEP
    43 !include .depend
    44 !endif
    4589
    46 clean:
    47     $(RM) *.obj *.pch
    48     $(RM) *.lib
     90# Includes the common rules.
     91!include $(PDWIN32_INCLUDE)/pdwin32.post
    4992
  • trunk/src/opengl/glide/cvg/init/makefile

    r2888 r3031  
    1 # $Id: makefile,v 1.1 2000-02-25 00:37:52 sandervl Exp $
     1# $Id: makefile,v 1.2 2000-03-06 23:33:44 bird Exp $
    22#
    33# PD-Win32 API
    44#
    5 #       Glide makefile
     5#       Init makefile
    66#
    77
     8# Directory macros.
    89PDWIN32_INCLUDE = ..\..\..\..\..\include
    910PDWIN32_LIB = ..\..\..\..\..\lib
    10 PDWIN32_BIN = ..\..\..\..\..\bin
     11PDWIN32_BIN = ..\..\..\..\..\$(OBJDIR)
    1112PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
    1213
     14
     15# Compiler, tools, and interference rules.
     16LOCALCLEAN  = 1
    1317!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1418!include ..\3dfx.mak
    1519
    16 TARGET=init
     20# Flag overloads and local macros.
     21CLEANEXTRAS =
    1722
    18 CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\glide;..\texus;..\..\swlibs\pcilib
     23CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;..\glide;..\texus;..\..\swlibs\pcilib
     24CFLAGS      = $(CFLAGS) $(CINCLUDE)
     25CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
    1926
    20 CFLAGS = $(CFLAGS) $(CINCLUDE)
    21 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
    2227
    23 OBJS =  DAC.OBJ GAMMA.OBJ GDEBUG.OBJ INFO.OBJ PARSE.OBJ \
    24         PRINT.OBJ SLI.OBJ SST1INIT.OBJ UTIL.OBJ VIDEO.OBJ
     28# Object files. All objects should be prefixed with $(OBJDIR)!
     29OBJS = \
     30$(OBJDIR)\DAC.OBJ \
     31$(OBJDIR)\GAMMA.OBJ \
     32$(OBJDIR)\GDEBUG.OBJ \
     33$(OBJDIR)\INFO.OBJ \
     34$(OBJDIR)\PARSE.OBJ \
     35$(OBJDIR)\PRINT.OBJ \
     36$(OBJDIR)\SLI.OBJ \
     37$(OBJDIR)\SST1INIT.OBJ \
     38$(OBJDIR)\UTIL.OBJ \
     39$(OBJDIR)\VIDEO.OBJ
    2540
    26 all: $(TARGET).lib
    2741
    28 $(TARGET).lib: $(OBJS)
    29         $(RM) $(TARGET).lib
    30         $(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS),,
     42# Target name - name of the dll without extention and path.
     43TARGET  = init
     44
     45
     46# All rule - build objs, target dll, copies dll to bin and makes libs.
     47all:    $(OBJDIR) \
     48        $(OBJDIR)\$(TARGET).lib
     49
     50
     51# Create all libraries (not importlibraries)
     52libs: all
     53
     54
     55# Lib target rule - builds the library.
     56$(OBJDIR)\$(TARGET).lib: $(OBJS)
     57    $(RM) $@
     58    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
    3159
    3260
    3361
     62# Dep rule - makes depenencies for C, C++ and Asm files.
    3463dep:
    3564    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
    3665        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
    37         ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\glide\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h 
     66        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\glide\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h
    3867
    39 !ifndef NODEP
    40 !include .depend
    41 !endif
    4268
    43 clean:
    44     $(RM) *.obj *.pch
    45     $(RM) *.lib
     69# Includes the common rules.
     70!include $(PDWIN32_INCLUDE)/pdwin32.post
    4671
  • trunk/src/opengl/glide/cvg/makefile

    r3011 r3031  
    1 # $Id: makefile,v 1.6 2000-03-04 20:03:43 bird Exp $
     1# $Id: makefile,v 1.7 2000-03-06 23:33:43 bird Exp $
     2
    23#
    3 # PD-Win32 API
     4# Odin32 API
    45#
    5 #       Glide makefile
     6#       Glide\cvg makefile
    67#
    78
     9# Directory macros.
    810PDWIN32_INCLUDE = ..\..\..\..\include
    9 PDWIN32_LIB = ..\..\..\..\lib
    10 PDWIN32_BIN = ..\..\..\..\bin
    11 PDWIN32_TOOLS = ..\..\..\..\tools\bin
     11PDWIN32_LIB     = ..\..\..\..\lib
     12PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\..\..\tools\bin
    1214
     15
     16# Have extra clean rule.
     17CLEAN2 = 1
     18
     19
     20# Compiler, tools, and interference rules.
     21!include $(PDWIN32_INCLUDE)/pdwin32.mk
     22
     23
     24# Flag overloads and local macros.
     25CLEANEXTRAS = rsrc.asm
     26
     27
     28# Object files. All objects should be prefixed with $(OBJDIR)!
     29OBJS = \
     30$(OBJDIR)\initterm.obj
     31
     32
     33# Target name - name of the dll without extention and path.
    1334TARGET = glide2x
    1435
    15 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    1636
    17 CFLAGS = $(CFLAGS)  -I$(PDWIN32_INCLUDE)
    18 CXXFLAGS = $(CXXFLAGS)  -I$(PDWIN32_INCLUDE)
     37# All rule - build objs, target dll, copies dll to bin and makes libs.
     38all:    $(OBJDIR) \
     39        $(OBJDIR)\$(TARGET).dll \
     40        $(PDWIN32_BIN)\$(TARGET).dll \
     41        lib
    1942
    20 OBJS =  initterm.obj \
    21         glideres.obj \
    22         ..\swlibs\pcilib\pcilib.lib \
    23         texus\texus.lib \
    24         init\init.lib \
    25         glide\glide.lib \
    2643
    27 all: ..\swlibs\pcilib\pcilib.lib init\init.lib texus\texus.lib glide\glide.lib $(TARGET).dll $(TARGET).lib
     44# Lib rule - build importlibrary (and evt. other libs)
     45lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    2846
    29 ..\swlibs\pcilib\pcilib.lib:
     47
     48
     49# Libs rule - Make (sub) libraries. (Not import libraries!)
     50libs:
    3051    cd ..\swlibs\pcilib
    31     $(MAKE_CMD)
    32     cd ..\..\cvg
    33 
    34 init\init.lib:
    35     cd init
    36     $(MAKE_CMD)
     52    $(MAKE_CMD) $@
     53    cd ..\..\cvg\init
     54    $(MAKE_CMD) $@
     55    cd ..\glide
     56    $(MAKE_CMD) $@
     57    cd ..\texus
     58    $(MAKE_CMD) $@
    3759    cd ..
    3860
    39 glide\glide.lib:
    40     cd glide
    41     $(MAKE_CMD)
    42     cd ..
    4361
    44 texus\texus.lib:
    45     cd texus
    46     $(MAKE_CMD)
    47     cd ..
     62# Dll rule - builds the target dll.
     63$(OBJDIR)\$(TARGET).dll: $(OBJS) libs $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     64    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4865
    49 $(TARGET).dll: $(OBJS) $(TARGET).def
    50     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    51           $(PDWIN32_LIB)/kernel32.lib \
    52           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    53     $(CP) $@ $(PDWIN32_BIN)\Glide\Voodoo2
    5466
    55 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
     67# Linker file - creates the parameter file passed on to the linker.
     68$(OBJDIR)\$(TARGET).lrf: makefile
     69    @echo Creating file <<$@
     70/OUT:$(OBJDIR)\$(TARGET).dll
     71/MAP:$(OBJDIR)\$(TARGET).map
     72$(OBJS)
     73..\swlibs\pcilib\$(OBJDIR)\pcilib.lib
     74texus\$(OBJDIR)\texus.lib
     75init\$(OBJDIR)\init.lib
     76glide\$(OBJDIR)\glide.lib
     77$(PDWIN32_LIB)\kernel32.lib
     78$(PDWIN32_LIB)\odincrt.lib
     79OS2386.LIB
     80$(RTLLIB_O)
     81$(TARGET).def
     82<<keep
    5683
    57 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
     84
     85# Copy rule - copies the dll.
     86$(PDWIN32_BIN)\Glide\Voodoo2\$(TARGET).dll: $(OBJDIR)\$(TARGET).dll
    5887    $(CP) $** $@
    5988
    60 $(TARGET).lib: $(TARGET).def
    61     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET).def
    62     $(CP) $@ $(PDWIN32_LIB)
    6389
    64 RCFLAGS = $(RCFLAGS) -I..\swlibs\fxmisc -Iglide
    65 
    66 glideres.asm: glide\glide.rc
    67     $(RC) $(RCFLAGS) -o glideres.asm glide\glide.rc
    68 
    69 initterm.obj: initterm.cpp
    70 
     90# Dep rule - makes depenencies for C, C++ and Asm files.
    7191dep:
    7292    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    7393        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    7494    cd ..\swlibs\pcilib
    75     $(MAKE_CMD) dep
    76     cd ..\..\cvg\glide
    77     $(MAKE_CMD) dep
    78     cd ..\init
    79     $(MAKE_CMD) dep
     95    $(MAKE_CMD) $@
     96    cd ..\..\cvg\init
     97    $(MAKE_CMD) $@
     98    cd ..\glide
     99    $(MAKE_CMD) $@
    80100    cd ..\texus
    81     $(MAKE_CMD) dep
     101    $(MAKE_CMD) $@
    82102    cd ..
    83103
    84 !ifndef NODEP
    85 !include .depend
    86 !endif
    87104
    88 clean:
    89     $(RM) *.obj *.pch
    90     $(RM) *.map *.dll
    91     $(RM) *.lib
    92     $(RM) glideres.asm
     105# Extra cleanrule.
     106clean2:
    93107    cd ..\swlibs\pcilib
    94108    $(MAKE_CMD) clean
     
    101115    cd ..
    102116
     117
     118# Includes the common rules.
     119!include $(PDWIN32_INCLUDE)/pdwin32.post
     120
     121
     122
  • trunk/src/opengl/glide/cvg/texus/makefile

    r2888 r3031  
    1 # $Id: makefile,v 1.1 2000-02-25 00:37:59 sandervl Exp $
     1# $Id: makefile,v 1.2 2000-03-06 23:33:44 bird Exp $
    22#
    33# PD-Win32 API
     
    66#
    77
     8# Directory macros.
    89PDWIN32_INCLUDE = ..\..\..\..\..\include
    9 PDWIN32_LIB = ..\..\..\..\..\lib
    10 PDWIN32_BIN = ..\..\..\..\..\bin
    11 PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
     10PDWIN32_LIB     = ..\..\..\..\..\lib
     11PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
     12PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
    1213
    13 TARGET=TEXUS
    1414
     15# Local cleanup only.
     16LOCALCLEAN = 1
     17
     18
     19# Compiler, tools, and interference rules.
    1520!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1621!include ..\3dfx.mak
    1722
    18 CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\init;..\glide;..\..\swlibs\pcilib
    1923
    20 CFLAGS = $(CFLAGS) $(CINCLUDE)
    21 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
     24# Flag overloads and local macros.
     25CLEANEXTRAS =
    2226
    23 OBJS =  3DF.OBJ         CLAMP.OBJ       DEQUANT.OBJ     DIFFUSE.OBJ     GLDUTIL.OBJ \
    24         MIPMAP.OBJ      NCC.OBJ         NCCNNET.OBJ     PAL256.OBJ      PPM.OBJ \
    25         QUANTIZE.OBJ    READ.OBJ        RESAMPLE.OBJ    RGT.OBJ         TEXUSLIB.OBJ \
    26         TGA.OBJ         UTIL.OBJ        VIEW.OBJ        WRITE.OBJ
     27CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;..\init;..\glide;..\..\swlibs\pcilib
     28CFLAGS      = $(CFLAGS) $(CINCLUDE)
     29CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
    2730
    28 all: $(TARGET).lib
    2931
    30 $(TARGET).lib: $(OBJS)
    31         $(RM) $(TARGET).lib
    32         $(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
     32# Object files. All objects should be prefixed with $(OBJDIR)!
     33OBJS = \
     34$(OBJDIR)\3DF.OBJ \
     35$(OBJDIR)\CLAMP.OBJ \
     36$(OBJDIR)\DEQUANT.OBJ \
     37$(OBJDIR)\DIFFUSE.OBJ \
     38$(OBJDIR)\GLDUTIL.OBJ \
     39$(OBJDIR)\MIPMAP.OBJ \
     40$(OBJDIR)\NCC.OBJ \
     41$(OBJDIR)\NCCNNET.OBJ \
     42$(OBJDIR)\PAL256.OBJ \
     43$(OBJDIR)\PPM.OBJ \
     44$(OBJDIR)\QUANTIZE.OBJ \
     45$(OBJDIR)\READ.OBJ \
     46$(OBJDIR)\RESAMPLE.OBJ \
     47$(OBJDIR)\RGT.OBJ \
     48$(OBJDIR)\TEXUSLIB.OBJ \
     49$(OBJDIR)\TGA.OBJ \
     50$(OBJDIR)\UTIL.OBJ \
     51$(OBJDIR)\VIEW.OBJ \
     52$(OBJDIR)\WRITE.OBJ
    3353
     54
     55# Target name - name of the library without extention and path.
     56TARGET = texus
     57
     58
     59# All rule - build objs and target library.
     60all:    $(OBJDIR) \
     61        $(OBJDIR)\$(TARGET).lib
     62
     63
     64# Create all libraries (not importlibraries)
     65libs: all
     66
     67
     68# Lib rule - build importlibrary (and evt. other libs)
     69$(OBJDIR)\$(TARGET).lib: $(OBJS)
     70    $(RM) $@
     71    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
     72
     73
     74# Dep rule - makes depenencies for C, C++ and Asm files.
    3475dep:
    3576    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
    3677        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
    37         ..\incsrc\*.h ..\..\swlibs\fxmisc*.h ..\glide\*.h ..\init\*.h ..\..\swlibs\pcilib\*.h 
     78        ..\incsrc\*.h ..\..\swlibs\fxmisc*.h ..\glide\*.h ..\init\*.h ..\..\swlibs\pcilib\*.h
    3879
    39 !ifndef NODEP
    40 !include .depend
    41 !endif
    4280
    43 clean:
    44     $(RM) *.obj *.lib
     81# Includes the common rules.
     82!include $(PDWIN32_INCLUDE)/pdwin32.post
    4583
  • trunk/src/opengl/glide/makefile

    r3011 r3031  
    1 # $Id: makefile,v 1.3 2000-03-04 20:03:42 bird Exp $
     1# $Id: makefile,v 1.4 2000-03-06 23:33:43 bird Exp $
    22#
    3 # PD-Win32 API
     3# Odin32 API
    44#
    55#       main glide makefile
    66#
    77
    8 PDWIN32_INCLUDE = ..\..\..\include
    9 PDWIN32_LIB = ..\..\..\lib
    10 PDWIN32_BIN = ..\..\..\bin
    11 PDWIN32_TOOLS = ..\..\..\tools\bin
     8# Directories
     9PDWIN32_INCLUDE = ..\..\include
     10
     11# Common tools macros. (MAKE_CMD)
     12!include ..\..\..\include\pdwin32.tools
    1213
    1314
    14 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    15 
    16 TARGET1 = cvg\glide2x
    17 TARGET2 = sst1\glide2x
    18 
    19 all: $(TARGET1).dll $(TARGET2).dll
    20 lib: $(TARGET1).lib
    21 
    22 $(TARGET1).dll:
     15# All, Lib, Clean and Dep rules.
     16all lib clean dep:
    2317    cd cvg
    24     $(MAKE_CMD)
     18    $(MAKE_CMD) $@
     19    cd ..\sst1
     20    $(MAKE_CMD) $@
    2521    cd ..
    2622
    27 $(TARGET2).dll:
    28     cd sst1
    29     $(MAKE_CMD)
    30     cd ..
    31 
    32 $(TARGET1).lib:
    33     cd cvg
    34     $(MAKE_CMD) $(@F)
    35     cd ..
    36 
    37 clean:
    38     cd cvg
    39     $(MAKE_CMD) clean
    40     cd ..\sst1
    41     $(MAKE_CMD) clean
    42     cd ..
    43 
    44 dep:
    45     cd cvg
    46     $(MAKE_CMD) dep
    47     cd ..\sst1
    48     $(MAKE_CMD) dep
    49     cd ..
    50 
  • trunk/src/opengl/glide/sst1/glide/makefile

    r2885 r3031  
    1 # $Id: makefile,v 1.1 2000-02-25 00:31:20 sandervl Exp $
     1# $Id: makefile,v 1.2 2000-03-06 23:33:45 bird Exp $
    22#
    3 # PD-Win32 API
     3# Odin32 API
    44#
    55#       Glide makefile
    66#
    77
     8# Directory macros.
    89PDWIN32_INCLUDE = ..\..\..\..\..\include
    9 PDWIN32_LIB = ..\..\..\..\..\lib
    10 PDWIN32_BIN = ..\..\..\..\..\bin
    11 PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
     10PDWIN32_LIB     = ..\..\..\..\..\lib
     11PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
     12PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
    1213
    13 TARGET=glide
     14# Local cleanup only.
     15LOCALCLEAN = 1
    1416
     17# Compiler, tools, and interference rules.
    1518!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1619!include ..\3dfx.mak
    1720
    18 CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\texus;..\..\swlibs\pcilib;$(PDWIN32_INCLUDE)
    1921
    20 CFLAGS = $(CFLAGS) $(CINCLUDE)
    21 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
     22# Flag overloads and local macros.
     23CLEANEXTRAS = glidersrc.asm
    2224
    23 OBJS =  CPUDTECT.OBJ    DDGUMP.OBJ      DIGLIDE.OBJ     DIGUTEX.OBJ     DISST.OBJ \
    24         DITEX.OBJ       G3DF.OBJ        GAA.OBJ         GBANNER.OBJ \
    25         GDRAW.OBJ       GERROR.OBJ      GGLIDE.OBJ      GLFB.OBJ        GMOVIE.OBJ \
    26         GPCI.OBJ        GSPLASH.OBJ     GSST.OBJ        GTEX.OBJ        GTEXDL.OBJ \
    27         GU.OBJ          GUCLIP.OBJ      GUMP.OBJ        GUTEX.OBJ       GXDRAW.OBJ \
    28         P6FENCE.OBJ     SST96.OBJ
     25CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\texus;..\..\swlibs\pcilib;
     26CFLAGS      = $(CFLAGS) $(CINCLUDE)
     27CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
     28RCFLAGS     = $(RCFLAGS) $(CINCLUDE)
    2929
    3030
    31 all: $(TARGET).lib
     31# Object files. All objects should be prefixed with $(OBJDIR)!
     32OBJS = \
     33$(OBJDIR)\CPUDTECT.OBJ \
     34$(OBJDIR)\DDGUMP.OBJ \
     35$(OBJDIR)\DIGLIDE.OBJ \
     36$(OBJDIR)\DIGUTEX.OBJ \
     37$(OBJDIR)\DISST.OBJ \
     38$(OBJDIR)\DITEX.OBJ \
     39$(OBJDIR)\G3DF.OBJ \
     40$(OBJDIR)\GAA.OBJ \
     41$(OBJDIR)\GBANNER.OBJ \
     42$(OBJDIR)\GDRAW.OBJ \
     43$(OBJDIR)\GERROR.OBJ \
     44$(OBJDIR)\GGLIDE.OBJ \
     45$(OBJDIR)\GLFB.OBJ \
     46$(OBJDIR)\GMOVIE.OBJ \
     47$(OBJDIR)\GPCI.OBJ \
     48$(OBJDIR)\GSPLASH.OBJ \
     49$(OBJDIR)\GSST.OBJ \
     50$(OBJDIR)\GTEX.OBJ \
     51$(OBJDIR)\GTEXDL.OBJ \
     52$(OBJDIR)\GU.OBJ \
     53$(OBJDIR)\GUCLIP.OBJ \
     54$(OBJDIR)\GUMP.OBJ \
     55$(OBJDIR)\GUTEX.OBJ \
     56$(OBJDIR)\GXDRAW.OBJ \
     57$(OBJDIR)\P6FENCE.OBJ \
     58$(OBJDIR)\SST96.OBJ \
     59$(OBJDIR)\glidersrc.obj
    3260
    33 $(TARGET).lib: $(OBJS)
    34         $(RM) $(TARGET).lib
    35         $(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
    3661
     62# Target name - name of the library without extention and path.
     63TARGET  = glide
     64
     65# All rule - build objs and target library.
     66all:    $(OBJDIR) \
     67        $(OBJDIR)\$(TARGET).lib
     68
     69
     70# Create all libraries (not importlibraries)
     71libs: all
     72
     73
     74# Lib rule - build importlibrary (and evt. other libs)
     75$(OBJDIR)\$(TARGET).lib: $(OBJS)
     76    $(RM) $@
     77    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
     78
     79
     80# Dep rule - makes depenencies for C, C++ and Asm files.
    3781dep:
    3882    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
    3983        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
    40         ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\init\initvg\*.h ..\init\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h 
     84        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\init\initvg\*.h ..\init\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h
    4185
    42 !ifndef NODEP
    43 !include .depend
    44 !endif
    4586
    46 clean:
    47     $(RM) *.obj *.pch
    48     $(RM) *.lib
     87# Includes the common rules.
     88!include $(PDWIN32_INCLUDE)/pdwin32.post
    4989
  • trunk/src/opengl/glide/sst1/init/initvg/makefile

    r2885 r3031  
    1 # $Id: makefile,v 1.1 2000-02-25 00:31:33 sandervl Exp $
     1# $Id: makefile,v 1.2 2000-03-06 23:33:47 bird Exp $
    22#
    33# PD-Win32 API
     
    66#
    77
     8# Directory macros.
    89PDWIN32_INCLUDE = ..\..\..\..\..\..\include
    9 PDWIN32_LIB = ..\..\..\..\..\..\lib
    10 PDWIN32_BIN = ..\..\..\..\..\..\bin
    11 PDWIN32_TOOLS = ..\..\..\..\..\..\tools\bin
     10PDWIN32_LIB     = ..\..\..\..\..\..\lib
     11PDWIN32_BIN     = ..\..\..\..\..\..\$(OBJDIR)
     12PDWIN32_TOOLS   = ..\..\..\..\..\..\tools\bin
    1213
     14
     15# Local cleanup only.
     16LOCALCLEAN = 1
     17
     18
     19# Compiler, tools, and interference rules.
    1320!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1421!include ..\..\3dfx.mak
    1522
    16 CINCLUDE=-I..\..\incsrc;..\..\..\swlibs\fxmisc;..\..\init;..\..\glide;..\..\texus;..\..\..\swlibs\pcilib
    1723
    18 CFLAGS = $(CFLAGS) $(CINCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
     24# Flag overloads and local macros.
     25CLEANEXTRAS = glide.asm
    2026
    21 OBJS =  DAC.OBJ         GAMMA.OBJ       GDEBUG.OBJ      INFO.OBJ        PARSE.OBJ \
    22         PRINT.OBJ       SLI.OBJ         SST1INIT.OBJ    UTIL.OBJ        VIDEO.OBJ
     27CINCLUDE    = -I..\..\incsrc;..\..\..\swlibs\fxmisc;..\..\init;..\..\glide;..\..\texus;..\..\..\swlibs\pcilib
     28CFLAGS      = $(CFLAGS) $(CINCLUDE)
     29CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
    2330
    24 all: $(OBJS)
    2531
     32# Object files. All objects should be prefixed with $(OBJDIR)!
     33OBJS = \
     34$(OBJDIR)\DAC.OBJ \
     35$(OBJDIR)\GAMMA.OBJ \
     36$(OBJDIR)\GDEBUG.OBJ \
     37$(OBJDIR)\INFO.OBJ \
     38$(OBJDIR)\PARSE.OBJ \
     39$(OBJDIR)\PRINT.OBJ \
     40$(OBJDIR)\SLI.OBJ \
     41$(OBJDIR)\SST1INIT.OBJ \
     42$(OBJDIR)\UTIL.OBJ \
     43$(OBJDIR)\VIDEO.OBJ
     44
     45
     46# All - rule make all objects.
     47all:    $(OBJDIR) \
     48        $(OBJS)
     49
     50
     51# Dep rule - makes depenencies for C, C++ and Asm files.
    2652dep:
    2753    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
    2854        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
    29         ..\..\incsrc\*.h ..\..\..\swlibs\fxmisc\*.h ..\*.h ..\..\glide\*.h ..\..\texus\*.h ..\..\..\swlibs\pcilib\*.h
     55        ..\..\incsrc\*.h ..\..\..\swlibs\fxmisc\*.h ..\*.h ..\..\glide\*.h \
     56        ..\..\texus\*.h ..\..\..\swlibs\pcilib\*.h
    3057
    31 !ifndef NODEP
    32 !include .depend
    33 !endif
    3458
    35 clean:
    36     $(RM) *.obj *.pch
    37     $(RM) *.lib
     59# Includes the common rules.
     60!include $(PDWIN32_INCLUDE)/pdwin32.post
    3861
  • trunk/src/opengl/glide/sst1/init/makefile

    r3011 r3031  
    1 # $Id: makefile,v 1.2 2000-03-04 20:03:43 bird Exp $
     1# $Id: makefile,v 1.3 2000-03-06 23:33:46 bird Exp $
    22#
    3 # PD-Win32 API
     3# Odin32 API
    44#
    5 #       Glide makefile
     5#       sst1\Init makefile
    66#
    77
     8# Directory macros.
    89PDWIN32_INCLUDE = ..\..\..\..\..\include
    9 PDWIN32_LIB = ..\..\..\..\..\lib
    10 PDWIN32_BIN = ..\..\..\..\..\bin
    11 PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
     10PDWIN32_LIB     = ..\..\..\..\..\lib
     11PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
     12PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
    1213
     14# Local cleanup only and extra cleanrule.
     15LOCALCLEAN = 1
     16CLEAN2     = 1
     17
     18# Compiler, tools, and interference rules.
    1319!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1420!include ..\3dfx.mak
    1521
    16 TARGET1=init
    17 TARGET2=initvg
    1822
    19 CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;initvg;..\glide;..\texus;..\..\swlibs\pcilib
     23# Flag overloads and local macros.
     24CLEANEXTRAS =
    2025
    21 CFLAGS = $(CFLAGS) $(CINCLUDE)
    22 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
    23 
    24 OBJS =  H3DRVR.OBJ      INIT.OBJ        VG96DRVR.OBJ    VGDRVR.OBJ \
    25         $(TARGET2)\DAC.OBJ         $(TARGET2)\GAMMA.OBJ       $(TARGET2)\GDEBUG.OBJ      $(TARGET2)\INFO.OBJ        $(TARGET2)\PARSE.OBJ \
    26         $(TARGET2)\PRINT.OBJ       $(TARGET2)\SLI.OBJ         $(TARGET2)\SST1INIT.OBJ    $(TARGET2)\UTIL.OBJ        $(TARGET2)\VIDEO.OBJ
    27 
    28 all: $(TARGET2).lib $(TARGET1).lib
    29 
    30 $(TARGET1).lib: $(OBJS)
    31         $(RM) $(TARGET1).lib
    32         $(ILIB) $(ILIBFLAGS) $(TARGET1).lib $(OBJS),,
     26CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;initvg;..\glide;..\texus;..\..\swlibs\pcilib
     27CFLAGS      = $(CFLAGS) $(CINCLUDE)
     28CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
    3329
    3430
    35 $(TARGET2).lib:
    36     cd initvg
    37     $(MAKE_CMD)
     31# Object files. All objects should be prefixed with $(OBJDIR)!
     32INITSUB = initvg
     33OBJS = \
     34$(OBJDIR)\H3DRVR.OBJ \
     35$(OBJDIR)\INIT.OBJ \
     36$(OBJDIR)\VG96DRVR.OBJ \
     37$(OBJDIR)\VGDRVR.OBJ
     38
     39# More object files
     40OBJSSUB = \
     41$(INITSUB)\$(OBJDIR)\DAC.OBJ \
     42$(INITSUB)\$(OBJDIR)\GAMMA.OBJ \
     43$(INITSUB)\$(OBJDIR)\GDEBUG.OBJ \
     44$(INITSUB)\$(OBJDIR)\INFO.OBJ \
     45$(INITSUB)\$(OBJDIR)\PARSE.OBJ \
     46$(INITSUB)\$(OBJDIR)\PRINT.OBJ \
     47$(INITSUB)\$(OBJDIR)\SLI.OBJ \
     48$(INITSUB)\$(OBJDIR)\SST1INIT.OBJ \
     49$(INITSUB)\$(OBJDIR)\UTIL.OBJ \
     50$(INITSUB)\$(OBJDIR)\VIDEO.OBJ
     51
     52
     53# Target name - name of the library without extention and path.
     54TARGET  = init
     55
     56
     57# All rule - build objs and target library.
     58all:    $(OBJDIR) \
     59        initsub \
     60        $(OBJDIR)\$(TARGET).lib \
     61
     62
     63# Make objectfiles in subdirectories.
     64initsub:
     65    cd $(INITSUB)
     66    $(MAKE_CMD) all
    3867    cd ..
    3968
     69
     70# Create all libraries (not importlibraries)
     71libs: all
     72
     73
     74# Lib rule - build importlibrary (and evt. other libs)
     75$(OBJDIR)\$(TARGET).lib: $(OBJS)
     76    $(RM) $@
     77    $(ILIB) $(ILIBFLAGS) $@ $(OBJS) $(OBJSSUB);
     78
     79
     80# Dep rule - makes depenencies for C, C++ and Asm files.
    4081dep:
    4182    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
     
    4384        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h initvg\*.h ..\glide\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h
    4485    cd initvg
    45     $(MAKE_CMD) dep
     86    $(MAKE_CMD) $@
     87    cd ..
    4688
    47 !ifndef NODEP
    48 !include .depend
    49 !endif
    5089
    51 clean:
    52     $(RM) *.obj *.pch
    53     $(RM) *.lib
     90# Includes the common rules.
     91!include $(PDWIN32_INCLUDE)/pdwin32.post
     92
     93
     94# extra clean rule
     95clean2:
    5496    cd initvg
    5597    $(MAKE_CMD) clean
    5698    cd ..
    57 
  • trunk/src/opengl/glide/sst1/makefile

    r3011 r3031  
    1 # $Id: makefile,v 1.2 2000-03-04 20:03:43 bird Exp $
     1# $Id: makefile,v 1.3 2000-03-06 23:33:44 bird Exp $
     2
    23#
    3 # PD-Win32 API
     4# Odin32 API
    45#
    5 #       Glide makefile
     6#       sst1\Glide makefile
    67#
    78
     9# Directory macros.
    810PDWIN32_INCLUDE = ..\..\..\..\include
    911PDWIN32_LIB = ..\..\..\..\lib
     
    1113PDWIN32_TOOLS = ..\..\..\..\tools\bin
    1214
     15
     16# Have extra clean rule.
     17CLEAN2 = 1
     18
     19# Compiler, tools, and interference rules.
     20!include $(PDWIN32_INCLUDE)/pdwin32.mk
     21
     22
     23# Object files. All objects should be prefixed with $(OBJDIR)!
     24OBJS = \
     25$(OBJDIR)\initterm.obj
     26
     27
     28# Target name - name of the dll without extention and path.
    1329TARGET = glide2x
    1430
    15 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    1631
    17 CFLAGS = $(CFLAGS)  -I$(PDWIN32_INCLUDE)
    18 CXXFLAGS = $(CXXFLAGS)  -I$(PDWIN32_INCLUDE)
     32# All rule - build objs, target dll, copies dll to bin and makes libs.
     33all:    $(OBJDIR) \
     34        libs \
     35        $(OBJDIR)\$(TARGET).dll \
     36        $(PDWIN32_BIN)\$(TARGET).dll \
     37        lib
    1938
    20 OBJS =  initterm.obj \
    21         glideres.obj \
    22         ..\swlibs\pcilib\pcilib.lib \
    23         texus\texus.lib \
    24         init\init.lib \
    25         glide\glide.lib \
    2639
    27 all: ..\swlibs\pcilib\pcilib.lib init\init.lib texus\texus.lib glide\glide.lib $(TARGET).dll $(TARGET).lib
     40# Lib rule - build importlibrary (and evt. other libs)
     41lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    2842
    29 ..\swlibs\pcilib\pcilib.lib:
     43
     44# Libs rule - Make (sub) libraries. (Not import libraries!)
     45libs:
    3046    cd ..\swlibs\pcilib
    31     $(MAKE_CMD)
    32     cd ..\..\sst1
    33 
    34 init\init.lib:
    35     cd init
    36     $(MAKE_CMD)
     47    $(MAKE_CMD) $@
     48    cd ..\..\sst1\init
     49    $(MAKE_CMD) $@
     50    cd ..\glide
     51    $(MAKE_CMD) $@
     52    cd ..\texus
     53    $(MAKE_CMD) $@
    3754    cd ..
    3855
    39 glide\glide.lib:
    40     cd glide
    41     $(MAKE_CMD)
    42     cd ..
    43 
    44 texus\texus.lib:
    45     cd texus
    46     $(MAKE_CMD)
    47     cd ..
    4856
    4957$(TARGET).dll: $(OBJS) $(TARGET).def
     
    5159          $(PDWIN32_LIB)/kernel32.lib \
    5260          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    53     $(CP) $@ $(PDWIN32_BIN)\Glide\Voodoo1
    5461
    55 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    5662
    57 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
     63# Dll rule - builds the target dll.
     64$(OBJDIR)\$(TARGET).dll: $(OBJS) libs $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     65    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
     66
     67
     68# Linker file - creates the parameter file passed on to the linker.
     69$(OBJDIR)\$(TARGET).lrf: makefile
     70    @echo Creating file <<$@
     71/OUT:$(OBJDIR)\$(TARGET).dll
     72/MAP:$(OBJDIR)\$(TARGET).map
     73$(OBJS)
     74..\swlibs\pcilib\$(OBJDIR)\pcilib.lib
     75texus\$(OBJDIR)\texus.lib
     76init\$(OBJDIR)\init.lib
     77glide\$(OBJDIR)\glide.lib
     78$(PDWIN32_LIB)\kernel32.lib
     79$(PDWIN32_LIB)\odincrt.lib
     80OS2386.LIB
     81$(RTLLIB_O)
     82$(TARGET).def
     83<<keep
     84
     85
     86# Copy rule.
     87$(PDWIN32_BIN)\Glide\Voodoo1\$(TARGET).dll: $(OBJDIR)\$(TARGET).dll
    5888    $(CP) $** $@
    5989
    60 $(TARGET).lib: $(TARGET).def
    61     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET).def
    62     $(CP) $@ $(PDWIN32_LIB)
    6390
    64 RCFLAGS = $(RCFLAGS) -I..\swlibs\fxmisc -Iglide
    65 
    66 glideres.asm: glide\glide.rc
    67     $(RC) $(RCFLAGS) -o glideres.asm glide\glide.rc
    68 
    69 initterm.obj: initterm.cpp
    70 
     91# Dep rule - makes depenencies for C, C++ and Asm files.
    7192dep:
    7293    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    7394        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    7495    cd ..\swlibs\pcilib
    75     $(MAKE_CMD) dep
    76     cd ..\..\sst1\glide
    77     $(MAKE_CMD) dep
    78     cd ..\init
    79     $(MAKE_CMD) dep
     96    $(MAKE_CMD) $@
     97    cd ..\..\sst1\init
     98    $(MAKE_CMD) $@
     99    cd ..\glide
     100    $(MAKE_CMD) $@
    80101    cd ..\texus
    81     $(MAKE_CMD) dep
     102    $(MAKE_CMD) $@
    82103    cd ..
    83104
    84 !ifndef NODEP
    85 !include .depend
    86 !endif
    87105
    88 clean:
    89     $(RM) *.obj *.pch
    90     $(RM) *.map *.dll
    91     $(RM) *.lib
    92     $(RM) glideres.asm
     106# Includes the common rules.
     107!include $(PDWIN32_INCLUDE)/pdwin32.post
     108
     109
     110# Extra clean rule
     111clean2:
    93112    cd ..\swlibs\pcilib
    94113    $(MAKE_CMD) clean
    95     cd ..\..\sst1\glide
     114    cd ..\..\sst1\init
    96115    $(MAKE_CMD) clean
    97     cd ..\init
     116    cd ..\glide
    98117    $(MAKE_CMD) clean
    99118    cd ..\texus
  • trunk/src/opengl/glide/sst1/texus/makefile

    r2885 r3031  
    1 # $Id: makefile,v 1.1 2000-02-25 00:31:37 sandervl Exp $
     1# $Id: makefile,v 1.2 2000-03-06 23:33:47 bird Exp $
     2
    23#
    3 # PD-Win32 API
     4# Odin32 API
    45#
    5 #       Glide makefile
     6#       Texus makefile
    67#
    78
     9# Directory macros.
    810PDWIN32_INCLUDE = ..\..\..\..\..\include
    9 PDWIN32_LIB = ..\..\..\..\..\lib
    10 PDWIN32_BIN = ..\..\..\..\..\bin
    11 PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
     11PDWIN32_LIB     = ..\..\..\..\..\lib
     12PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
    1214
    13 TARGET=TEXUS
    1415
     16# Local cleanup only.
     17LOCALCLEAN = 1
     18
     19
     20# Compiler, tools, and interference rules.
    1521!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1622!include ..\3dfx.mak
    1723
    18 CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\glide;..\..\swlibs\pcilib
     24# Flag overloads and local macros.
     25CLEANEXTRAS =
    1926
    20 CFLAGS = $(CFLAGS) $(CINCLUDE)
    21 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
     27CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\glide;..\..\swlibs\pcilib
     28CFLAGS      = $(CFLAGS) $(CINCLUDE)
     29CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
    2230
    23 OBJS =  3DF.OBJ         CLAMP.OBJ       DEQUANT.OBJ     DIFFUSE.OBJ     GLDUTIL.OBJ \
    24         MIPMAP.OBJ      NCC.OBJ         NCCNNET.OBJ     PAL256.OBJ      PPM.OBJ \
    25         QUANTIZE.OBJ    READ.OBJ        RESAMPLE.OBJ    RGT.OBJ         TEXUSLIB.OBJ \
    26         TGA.OBJ         UTIL.OBJ        VIEW.OBJ        WRITE.OBJ
    2731
    28 all: $(TARGET).lib
     32# Object files. All objects should be prefixed with $(OBJDIR)!
     33OBJS = \
     34$(OBJDIR)\3DF.OBJ \
     35$(OBJDIR)\CLAMP.OBJ \
     36$(OBJDIR)\DEQUANT.OBJ \
     37$(OBJDIR)\DIFFUSE.OBJ \
     38$(OBJDIR)\GLDUTIL.OBJ \
     39$(OBJDIR)\MIPMAP.OBJ \
     40$(OBJDIR)\NCC.OBJ \
     41$(OBJDIR)\NCCNNET.OBJ \
     42$(OBJDIR)\PAL256.OBJ \
     43$(OBJDIR)\PPM.OBJ \
     44$(OBJDIR)\QUANTIZE.OBJ \
     45$(OBJDIR)\READ.OBJ \
     46$(OBJDIR)\RESAMPLE.OBJ \
     47$(OBJDIR)\RGT.OBJ \
     48$(OBJDIR)\TEXUSLIB.OBJ \
     49$(OBJDIR)\TGA.OBJ \
     50$(OBJDIR)\UTIL.OBJ \
     51$(OBJDIR)\VIEW.OBJ \
     52$(OBJDIR)\WRITE.OBJ
    2953
    30 $(TARGET).lib: $(OBJS)
    31         $(RM) $(TARGET).lib
    32         $(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
    3354
     55# Target name - name of the library without extention and path.
     56TARGET  = texus
     57
     58
     59# All rule - build objs and target library.
     60all:    $(OBJDIR) \
     61        $(OBJDIR)\$(TARGET).lib
     62
     63
     64# Create all libraries (not importlibraries)
     65libs: all
     66
     67
     68# Lib rule - build importlibrary (and evt. other libs)
     69$(OBJDIR)\$(TARGET).lib: $(OBJS)
     70    $(RM) $@
     71    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
     72
     73
     74# Dep rule - makes depenencies for C, C++ and Asm files.
    3475dep:
    3576    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
    3677        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
    37         ..\incsrc\*.h ..\..\swlibs\fxmisc*.h ..\init\initvg\*.h ..\glide\*.h ..\init\*.h ..\..\swlibs\pcilib\*.h
     78        ..\incsrc\*.h ..\..\swlibs\fxmisc*.h ..\init\initvg\*.h \
     79        ..\glide\*.h ..\init\*.h ..\..\swlibs\pcilib\*.h
    3880
    39 !ifndef NODEP
    40 !include .depend
    41 !endif
    4281
    43 clean:
    44     $(RM) *.obj *.lib
     82# Includes the common rules.
     83!include $(PDWIN32_INCLUDE)/pdwin32.post
    4584
  • trunk/src/opengl/glide/swlibs/pcilib/makefile

    r2967 r3031  
    1 # $Id: makefile,v 1.2 2000-03-02 13:22:02 sandervl Exp $
     1# $Id: makefile,v 1.3 2000-03-06 23:33:47 bird Exp $
    22#
    3 # PD-Win32 API
     3# Odin32 API
    44#
    5 #       Glide makefile
     5#       swlibs\pcilib makefile
    66#
    77
     8# Directory macros.
    89PDWIN32_INCLUDE = ..\..\..\..\..\include
    9 PDWIN32_LIB = ..\..\..\..\..\lib
    10 PDWIN32_BIN = ..\..\..\..\..\bin
    11 PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
     10PDWIN32_LIB     = ..\..\..\..\..\lib
     11PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
     12PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
    1213
    13 TARGET=pcilib
    1414
     15# Local cleanup only.
     16LOCALCLEAN = 1
     17
     18
     19# Compiler, tools, and interference rules.
    1520!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1621!include ..\..\sst1\3dfx.mak
     22
     23
     24# Flag overloads and local macros.
     25CLEANEXTRAS =
    1726
    1827CINCLUDE=-I..\..\sst1\incsrc;..\fxmisc;..\..\sst1\init\initvg;..\..\sst1\glide;..\..\sst1\texus;..\..\sst1\init;$(PDWIN32_INCLUDE)
     
    2130CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
    2231
    23 OBJS = fxos2.obj fxpci.obj sst1_pci.obj fxinfo.obj
    2432
    25 all: $(TARGET).lib
     33# Object files. All objects should be prefixed with $(OBJDIR)!
     34OBJS = \
     35$(OBJDIR)\fxos2.obj \
     36$(OBJDIR)\fxpci.obj \
     37$(OBJDIR)\sst1_pci.obj \
     38$(OBJDIR)\fxinfo.obj
    2639
    27 $(TARGET).lib: $(OBJS)
    28         $(RM) $(TARGET).lib
    29         $(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
    3040
     41# Target name - name of the library without extention and path.
     42TARGET  = pcilib
     43
     44
     45# All rule - build objs and target library.
     46all:    $(OBJDIR) \
     47        $(OBJDIR)\$(TARGET).lib
     48
     49
     50# Create all libraries (not importlibraries)
     51libs: all
     52
     53
     54# Lib rule - build importlibrary (and evt. other libs)
     55$(OBJDIR)\$(TARGET).lib: $(OBJS)
     56    $(RM) $@
     57    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
     58
     59
     60# Dep rule - makes depenencies for C, C++ and Asm files.
    3161dep:
    3262    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
    3363        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
    34         ..\..\sst1\incsrc\*.h ..\fxmisc\*.h ..\..\sst1\init\initvg\*.h ..\..\sst1\glide*.h ..\..\sst1\texus\*.h ..\..\sst1\init\*.h
     64        ..\..\sst1\incsrc\*.h ..\fxmisc\*.h ..\..\sst1\init\initvg\*.h \
     65        ..\..\sst1\glide*.h ..\..\sst1\texus\*.h ..\..\sst1\init\*.h
    3566
    36 !ifndef NODEP
    37 !include .depend
    38 !endif
    3967
    40 clean:
    41     $(RM) *.obj *.pch
    42     $(RM) *.lib
     68# Includes the common rules.
     69!include $(PDWIN32_INCLUDE)/pdwin32.post
    4370
  • trunk/src/opengl/glu/makefile

    r3003 r3031  
    1 # $Id: makefile,v 1.11 2000-03-04 19:49:55 bird Exp $
     1# $Id: makefile,v 1.12 2000-03-06 23:33:48 bird Exp $
    22
    33#
    4 # PD-Win32
     4# Odin32 API
    55#
    66# Top-level makefile for glu32
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\..\include
    10 PDWIN32_LIB = ..\..\..\lib
    11 PDWIN32_BIN = ..\..\..\bin
    12 PDWIN32_TOOLS = ..\..\..\tools\bin
     11PDWIN32_LIB     = ..\..\..\lib
     12PDWIN32_BIN     = ..\..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\..\tools\bin
    1314
     15# Have extra clean rule.
     16CLEAN2 = 1
     17
     18
     19# Compiler, tools, and interference rules.
    1420!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1521
    16 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa\GL
    17 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa\GL
    1822
    19 TARGET = GLU32
     23# Flag overloads and local macros.
     24CLEANEXTRAS = glu32rsrc.asm
    2025
    21 all: $(TARGET).DLL $(TARGET).LIB
    22 
    23 SOURCES = \
    24   nurbs\interface\bezierEval.cpp \
    25   nurbs\interface\bezierPatch.cpp \
    26   nurbs\interface\bezierPatchMesh.cpp \
    27   nurbs\interface\glcurveval.cpp \
    28   nurbs\interface\glinterface.cpp \
    29   nurbs\interface\glrenderer.cpp \
    30   nurbs\interface\glsurfeval.cpp \
    31   nurbs\interface\incurveeval.cpp \
    32   nurbs\interface\insurfeval.cpp \
    33   nurbs\interface\bezierEval.h \
    34   nurbs\interface\bezierPatch.h \
    35   nurbs\interface\bezierPatchMesh.h \
    36   nurbs\interface\glcurveval.h \
    37   nurbs\interface\glimports.h \
    38   nurbs\interface\glrenderer.h \
    39   nurbs\interface\glsurfeval.h \
    40   nurbs\interface\mystdio.h \
    41   nurbs\interface\mystdlib.h \
    42   nurbs\internals\arc.cpp \
    43   nurbs\internals\arcsorter.cpp \
    44   nurbs\internals\arctess.cpp \
    45   nurbs\internals\backend.cpp \
    46   nurbs\internals\basiccrveval.cpp \
    47   nurbs\internals\basicsurfeval.cpp \
    48   nurbs\internals\bin.cpp \
    49   nurbs\internals\bufpool.cpp \
    50   nurbs\internals\cachingeval.cpp \
    51   nurbs\internals\ccw.cpp \
    52   nurbs\internals\coveandtiler.cpp \
    53   nurbs\internals\curve.cpp \
    54   nurbs\internals\curvelist.cpp \
    55   nurbs\internals\curvesub.cpp \
    56   nurbs\internals\dataTransform.cpp \
    57   nurbs\internals\displaylist.cpp \
    58   nurbs\internals\flist.cpp \
    59   nurbs\internals\flistsorter.cpp \
    60   nurbs\internals\hull.cpp \
    61   nurbs\internals\intersect.cpp \
    62   nurbs\internals\knotvector.cpp \
    63   nurbs\internals\mapdesc.cpp \
    64   nurbs\internals\mapdescv.cpp \
    65   nurbs\internals\maplist.cpp \
    66   nurbs\internals\mesher.cpp \
    67   nurbs\internals\monotonizer.cpp \
    68   nurbs\internals\monoTriangulationBackend.cpp \
    69   nurbs\internals\mycode.cpp \
    70   nurbs\internals\nurbsinterfac.cpp \
    71   nurbs\internals\nurbstess.cpp \
    72   nurbs\internals\patch.cpp \
    73   nurbs\internals\patchlist.cpp \
    74   nurbs\internals\quilt.cpp \
    75   nurbs\internals\reader.cpp \
    76   nurbs\internals\renderhints.cpp \
    77   nurbs\internals\slicer.cpp \
    78   nurbs\internals\sorter.cpp \
    79   nurbs\internals\splitarcs.cpp \
    80   nurbs\internals\subdivider.cpp \
    81   nurbs\internals\tobezier.cpp \
    82   nurbs\internals\trimline.cpp \
    83   nurbs\internals\trimregion.cpp \
    84   nurbs\internals\trimvertpool.cpp \
    85   nurbs\internals\uarray.cpp \
    86   nurbs\internals\varray.cpp \
    87   nurbs\internals\arc.h \
    88   nurbs\internals\arcsorter.h \
    89   nurbs\internals\arctess.h \
    90   nurbs\internals\backend.h \
    91   nurbs\internals\basiccrveval.h \
    92   nurbs\internals\basicsurfeval.h \
    93   nurbs\internals\bezierarc.h \
    94   nurbs\internals\bin.h \
    95   nurbs\internals\bufpool.h \
    96   nurbs\internals\cachingeval.h \
    97   nurbs\internals\coveandtiler.h \
    98   nurbs\internals\curve.h \
    99   nurbs\internals\curvelist.h \
    100   nurbs\internals\dataTransform.h \
    101   nurbs\internals\defines.h \
    102   nurbs\internals\displaylist.h \
    103   nurbs\internals\displaymode.h \
    104   nurbs\internals\flist.h \
    105   nurbs\internals\flistsorter.h \
    106   nurbs\internals\gridline.h \
    107   nurbs\internals\gridtrimvertex.h \
    108   nurbs\internals\gridvertex.h \
    109   nurbs\internals\hull.h \
    110   nurbs\internals\jarcloc.h \
    111   nurbs\internals\knotvector.h \
    112   nurbs\internals\mapdesc.h \
    113   nurbs\internals\maplist.h \
    114   nurbs\internals\mesher.h \
    115   nurbs\internals\myassert.h \
    116   nurbs\internals\mymath.h \
    117   nurbs\internals\mysetjmp.h \
    118   nurbs\internals\mystring.h \
    119   nurbs\internals\nurbsconsts.h \
    120   nurbs\internals\nurbstess.h \
    121   nurbs\internals\patch.h \
    122   nurbs\internals\patchlist.h \
    123   nurbs\internals\pwlarc.h \
    124   nurbs\internals\quilt.h \
    125   nurbs\internals\reader.h \
    126   nurbs\internals\renderhints.h \
    127   nurbs\internals\simplemath.h \
    128   nurbs\internals\slicer.h \
    129   nurbs\internals\sorter.h \
    130   nurbs\internals\subdivider.h \
    131   nurbs\internals\trimline.h \
    132   nurbs\internals\trimregion.h \
    133   nurbs\internals\trimvertex.h \
    134   nurbs\internals\trimvertpool.h \
    135   nurbs\internals\types.h \
    136   nurbs\internals\uarray.h \
    137   nurbs\internals\varray.h \
    138   nurbs\nurbtess\directedLine.cpp \
    139   nurbs\nurbtess\gridWrap.cpp \
    140   nurbs\nurbtess\monoChain.cpp \
    141   nurbs\nurbtess\monoPolyPart.cpp \
    142   nurbs\nurbtess\monoTriangulation.cpp \
    143   nurbs\nurbtess\partitionX.cpp \
    144   nurbs\nurbtess\partitionY.cpp \
    145   nurbs\nurbtess\polyDBG.cpp \
    146   nurbs\nurbtess\polyUtil.cpp \
    147   nurbs\nurbtess\primitiveStream.cpp \
    148   nurbs\nurbtess\quicksort.cpp \
    149   nurbs\nurbtess\rectBlock.cpp \
    150   nurbs\nurbtess\sampleComp.cpp \
    151   nurbs\nurbtess\sampleCompBot.cpp \
    152   nurbs\nurbtess\sampleCompRight.cpp \
    153   nurbs\nurbtess\sampleCompTop.cpp \
    154   nurbs\nurbtess\sampledLine.cpp \
    155   nurbs\nurbtess\sampleMonoPoly.cpp \
    156   nurbs\nurbtess\searchTree.cpp \
    157   nurbs\nurbtess\definitions.h \
    158   nurbs\nurbtess\directedLine.h \
    159   nurbs\nurbtess\glimports.h \
    160   nurbs\nurbtess\gridWrap.h \
    161   nurbs\nurbtess\monoChain.h \
    162   nurbs\nurbtess\monoPolyPart.h \
    163   nurbs\nurbtess\monoTriangulation.h \
    164   nurbs\nurbtess\mystdio.h \
    165   nurbs\nurbtess\mystdlib.h \
    166   nurbs\nurbtess\partitionX.h \
    167   nurbs\nurbtess\partitionY.h \
    168   nurbs\nurbtess\polyDBG.h \
    169   nurbs\nurbtess\polyUtil.h \
    170   nurbs\nurbtess\primitiveStream.h \
    171   nurbs\nurbtess\quicksort.h \
    172   nurbs\nurbtess\rectBlock.h \
    173   nurbs\nurbtess\sampleComp.h \
    174   nurbs\nurbtess\sampleCompBot.h \
    175   nurbs\nurbtess\sampleCompRight.h \
    176   nurbs\nurbtess\sampleCompTop.h \
    177   nurbs\nurbtess\sampledLine.h \
    178   nurbs\nurbtess\sampleMonoPoly.h \
    179   nurbs\nurbtess\searchTree.h \
    180   nurbs\nurbtess\zlassert.h \
    181   tess\dict.c \
    182   tess\geom.c \
    183   tess\memalloc.c \
    184   tess\mesh.c \
    185   tess\normal.c \
    186   tess\priorityq.c \
    187   tess\render.c \
    188   tess\sweep.c \
    189   tess\tess.c \
    190   tess\tessmono.c \
    191   tess\dict-list.h \
    192   tess\dict.h \
    193   tess\geom.h \
    194   tess\memalloc.h \
    195   tess\mesh.h \
    196   tess\normal.h \
    197   tess\priorityq-heap.h \
    198   tess\priorityq-sort.h \
    199   tess\priorityq.h \
    200   tess\render.h \
    201   tess\sweep.h \
    202   tess\tess.h \
    203   tess\tessmono.h \
    204   util\glue.c \
    205   util\error.c \
    206   util\mipmap.c \
    207   util\project.c \
    208   util\quad.c \
    209   util\registry.c \
    210   util\gluint.h
    211 
    212 OBJS = \
    213   initterm.obj \
    214   resource.obj \
    215   nurbs\interface\bezierEval.obj \
    216   nurbs\interface\bezierPatch.obj \
    217   nurbs\interface\bezierPatchMesh.obj \
    218   nurbs\interface\glcurveval.obj \
    219   nurbs\interface\glinterface.obj \
    220   nurbs\interface\glrenderer.obj \
    221   nurbs\interface\glsurfeval.obj \
    222   nurbs\interface\incurveeval.obj \
    223   nurbs\interface\insurfeval.obj \
    224   nurbs\internals\arc.obj \
    225   nurbs\internals\arcsorter.obj \
    226   nurbs\internals\arctess.obj \
    227   nurbs\internals\backend.obj \
    228   nurbs\internals\basiccrveval.obj \
    229   nurbs\internals\basicsurfeval.obj \
    230   nurbs\internals\bin.obj \
    231   nurbs\internals\bufpool.obj \
    232   nurbs\internals\cachingeval.obj \
    233   nurbs\internals\ccw.obj \
    234   nurbs\internals\coveandtiler.obj \
    235   nurbs\internals\curve.obj \
    236   nurbs\internals\curvelist.obj \
    237   nurbs\internals\curvesub.obj \
    238   nurbs\internals\dataTransform.obj \
    239   nurbs\internals\displaylist.obj \
    240   nurbs\internals\flist.obj \
    241   nurbs\internals\flistsorter.obj \
    242   nurbs\internals\hull.obj \
    243   nurbs\internals\intersect.obj \
    244   nurbs\internals\knotvector.obj \
    245   nurbs\internals\mapdesc.obj \
    246   nurbs\internals\mapdescv.obj \
    247   nurbs\internals\maplist.obj \
    248   nurbs\internals\mesher.obj \
    249   nurbs\internals\monotonizer.obj \
    250   nurbs\internals\monoTriangulationBackend.obj \
    251   nurbs\internals\mycode.obj \
    252   nurbs\internals\nurbsinterfac.obj \
    253   nurbs\internals\nurbstess.obj \
    254   nurbs\internals\patch.obj \
    255   nurbs\internals\patchlist.obj \
    256   nurbs\internals\quilt.obj \
    257   nurbs\internals\reader.obj \
    258   nurbs\internals\renderhints.obj \
    259   nurbs\internals\slicer.obj \
    260   nurbs\internals\sorter.obj \
    261   nurbs\internals\splitarcs.obj \
    262   nurbs\internals\subdivider.obj \
    263   nurbs\internals\tobezier.obj \
    264   nurbs\internals\trimline.obj \
    265   nurbs\internals\trimregion.obj \
    266   nurbs\internals\trimvertpool.obj \
    267   nurbs\internals\uarray.obj \
    268   nurbs\internals\varray.obj \
    269   nurbs\nurbtess\directedLine.obj \
    270   nurbs\nurbtess\gridWrap.obj \
    271   nurbs\nurbtess\monoChain.obj \
    272   nurbs\nurbtess\monoPolyPart.obj \
    273   nurbs\nurbtess\monoTriangulation.obj \
    274   nurbs\nurbtess\partitionX.obj \
    275   nurbs\nurbtess\partitionY.obj \
    276   nurbs\nurbtess\polyDBG.obj \
    277   nurbs\nurbtess\polyUtil.obj \
    278   nurbs\nurbtess\primitiveStream.obj \
    279   nurbs\nurbtess\quicksort.obj \
    280   nurbs\nurbtess\rectBlock.obj \
    281   nurbs\nurbtess\sampleComp.obj \
    282   nurbs\nurbtess\sampleCompBot.obj \
    283   nurbs\nurbtess\sampleCompRight.obj \
    284   nurbs\nurbtess\sampleCompTop.obj \
    285   nurbs\nurbtess\sampledLine.obj \
    286   nurbs\nurbtess\sampleMonoPoly.obj \
    287   nurbs\nurbtess\searchTree.obj \
    288   tess\dict.obj \
    289   tess\geom.obj \
    290   tess\memalloc.obj \
    291   tess\mesh.obj \
    292   tess\normal.obj \
    293   tess\priorityq.obj \
    294   tess\render.obj \
    295   tess\sweep.obj \
    296   tess\tess.obj \
    297   tess\tessmono.obj \
    298   util\glue.obj \
    299   util\error.obj \
    300   util\mipmap.obj \
    301   util\project.obj \
    302   util\quad.obj \
    303   util\registry.obj
     26CFLAGS      = $(CFLAGS) -I..\mesa\GL
     27CXXFLAGS    = $(CXXFLAGS) -I..\mesa\GL
    30428
    30529
    306 $(TARGET).DLL: $(SOURCES) initterm.obj resource.obj $(TARGET).lrf $(TARGET).def
    307     cd util
    308     $(MAKE_CMD)
    309     cd ..\tess
    310     $(MAKE_CMD)
    311     cd ..\nurbs
    312     $(MAKE_CMD)
    313     cd ..
    314     $(LD2) $(LD2FLAGS) /FREE @$(TARGET).lrf
    315     $(CP) $@ $(PDWIN32_BIN)
     30
     31# Object files. All objects should be prefixed with $(OBJDIR)!
     32OBJS = \
     33$(OBJDIR)\initterm.obj \
     34$(OBJDIR)\glu32rsrc.obj
    31635
    31736
    318 $(TARGET).lrf: makefile
    319     @echo Creating file <<$(@B).lrf
     37# Target name - name of the library without extention and path.
     38TARGET = glu32
     39
     40
     41# All rule - build objs, target dll, copies dll to bin and makes libs.
     42all:    $(OBJDIR) \
     43        $(OBJDIR)\$(TARGET).dll \
     44        $(PDWIN32_BIN)\$(TARGET).dll \
     45        lib
     46
     47
     48# Lib rule - build importlibrary (and evt. other libs)
     49lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
     50
     51
     52# Libs rule - Make (sub) libraries. (Not import libraries!)
     53libs:
     54    cd util
     55    $(MAKE_CMD) $@
     56    cd ..\tess
     57    $(MAKE_CMD) $@
     58    cd ..\nurbs
     59    $(MAKE_CMD) $@
     60    cd ..
     61
     62
     63# Dll rule - builds the target dll.
     64$(OBJDIR)\$(TARGET).dll: $(OBJS) libs $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     65    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
     66
     67
     68# Linker file - creates the parameter file passed on to the linker.
     69$(OBJDIR)\$(TARGET).lrf: makefile
     70    @echo Creating file <<$@
     71/OUT:$(OBJDIR)\$(TARGET).dll
     72/MAP:$(OBJDIR)\$(TARGET).map
    32073$(OBJS)
    321 /OUT:$(TARGET).DLL
     74nurbs\interface\$(OBJDIR)\interface.lib
     75nurbs\internals\$(OBJDIR)\internals.lib
     76nurbs\nurbtess\$(OBJDIR)\nurbtess.lib
     77tess\$(OBJDIR)\tess.lib
     78util\$(OBJDIR)\util.lib
    32279$(PDWIN32_LIB)\ODINCRT.LIB
    32380$(PDWIN32_LIB)\KERNEL32.LIB
     
    32986
    33087
    331 $(TARGET).lib: $(TARGET)exp.def
    332         $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    333         $(CP) $@ $(PDWIN32_LIB)
    334 
    335 $(TARGET)exp.def: $(TARGET).def
    336         $(IMPDEF) $** $@
    337 
    338 
    339 resource.asm: $(TARGET).rc
    340     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
    341 
    342 
     88# Dep rule - makes depenencies for C, C++ and Asm files.
    34389dep:
    34490    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win -I..\mesa\GL \
    34591    *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    34692    cd util
    347     $(MAKE_CMD) dep
     93    $(MAKE_CMD) $@
    34894    cd ..\tess
    349     $(MAKE_CMD) dep
     95    $(MAKE_CMD) $@
    35096    cd ..\nurbs
    351     $(MAKE_CMD) dep
     97    $(MAKE_CMD) $@
    35298    cd ..
    35399
    354 !ifndef NODEP
    355 !include .depend
    356 !endif
    357100
    358 
    359 clean:
    360     $(RM) *.obj *.dll *.lib *.lrf *exp.def resource.asm \
    361       $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib
     101# Extra Clean.
     102clean2:
    362103    cd util
    363104    $(MAKE_CMD) clean
     
    368109    cd ..
    369110
     111
     112# Includes the common rules.
     113!include $(PDWIN32_INCLUDE)/pdwin32.post
     114
  • trunk/src/opengl/glu/nurbs/interface/makefile

    r2961 r3031  
    1 # $Id: makefile,v 1.5 2000-03-01 14:50:16 sandervl Exp $
     1# $Id: makefile,v 1.6 2000-03-06 23:33:49 bird Exp $
    22#
    33# PD-Win32 API
     
    66#
    77
     8# Directory macros.
    89PDWIN32_INCLUDE = ..\..\..\..\..\include
    9 PDWIN32_LIB = ..\..\..\..\..\lib
    10 PDWIN32_BIN = ..\..\..\..\..\bin
    11 PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
     10PDWIN32_LIB     = ..\..\..\..\..\lib
     11PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
     12PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
    1213
    1314
     15# Local cleanup only.
     16LOCALCLEAN = 1
     17
     18
     19# Compiler, tools, and interference rules.
    1420!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1521
    16 CINCLUDE=-I..\..\..\mesa\GL -I..\.. -I..\internals -I..\nurbtess -I$(PDWIN32_INCLUDE) -I..\..\include  -I..\..\..\mesa
    1722
    18 CFLAGS = $(CFLAGS) $(CINCLUDE)  -DNDEBUG
    19 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
     23# Flag overloads and local macros.
     24CLEANEXTRAS =
    2025
    21 OBJS = glcurveval.obj glinterface.obj glrenderer.obj glsurfeval.obj \
    22        insurfeval.obj bezierPatch.obj bezierEval.obj bezierPatchMesh.obj \
    23        incurveeval.obj
     26CINCLUDE    = -I..\..\..\mesa\GL -I..\.. -I..\internals -I..\nurbtess \
     27              -I..\..\include  -I..\..\..\mesa
    2428
    25 all: $(OBJS)
     29CFLAGS      = $(CFLAGS) $(CINCLUDE)  -DNDEBUG
     30CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
    2631
    2732
     33# Object files. All objects should be prefixed with $(OBJDIR)!
     34OBJS = \
     35$(OBJDIR)\glcurveval.obj \
     36$(OBJDIR)\glinterface.obj \
     37$(OBJDIR)\glrenderer.obj \
     38$(OBJDIR)\glsurfeval.obj \
     39$(OBJDIR)\insurfeval.obj \
     40$(OBJDIR)\bezierPatch.obj \
     41$(OBJDIR)\bezierEval.obj \
     42$(OBJDIR)\bezierPatchMesh.obj \
     43$(OBJDIR)\incurveeval.obj
     44
     45
     46# Target name - name of the library without extention and path.
     47TARGET = interface
     48
     49
     50# Create all libraries (not importlibraries)
     51all:    $(OBJDIR) \
     52        $(OBJDIR)\$(TARGET).lib
     53
     54
     55# Create all libraries (not importlibraries)
     56libs: all
     57
     58
     59# Lib rule - build importlibrary (and evt. other libs)
     60$(OBJDIR)\$(TARGET).lib: $(OBJS)
     61    $(RM) $@
     62    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
     63
     64
     65# Dep rule - makes depenencies for C, C++ and Asm files.
    2866dep:
    2967    $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc \
    3068        ..\internals\*.h ..\nurbtess\*.h ..\..\..\mesa\GL\*.h
    3169
    32 !ifndef NODEP
    33 !include .depend
    34 !endif
    3570
     71# Includes the common rules.
     72!include $(PDWIN32_INCLUDE)/pdwin32.post
    3673
    37 clean:
    38     $(RM) *.obj *.pch
    39 
  • trunk/src/opengl/glu/nurbs/internals/makefile

    r2945 r3031  
    1 # $Id: makefile,v 1.3 2000-02-29 13:56:49 sandervl Exp $
     1# $Id: makefile,v 1.4 2000-03-06 23:33:49 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       glu/nurbs/internals makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\..\..\..\include
    10 PDWIN32_LIB = ..\..\..\..\..\lib
    11 PDWIN32_BIN = ..\..\..\..\..\bin
    12 PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
     11PDWIN32_LIB     = ..\..\..\..\..\lib
     12PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
    1314
    1415
     16# Local cleanup only.
     17LOCALCLEAN = 1
     18
     19
     20# Compiler, tools, and interference rules.
    1521!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1622
    17 CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I..\..\include -I$(PDWIN32_INCLUDE)
    18 CDEFS=-DSTANDALONE -DLIBRARYBUILD -DNDEBUG
    1923
    20 CFLAGS = $(CFLAGS) $(CINCLUDE) $(CDEFS)
    21 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) $(CDEFS)
     24# Flag overloads and local macros.
     25CLEANEXTRAS =
    2226
    23 OBJS = arc.obj arcsorter.obj arctess.obj backend.obj basiccrveval.obj \
    24        basicsurfeval.obj bin.obj bufpool.obj cachingeval.obj ccw.obj \
    25        coveandtiler.obj curve.obj curvelist.obj curvesub.obj displaylist.obj \
    26        flist.obj flistsorter.obj hull.obj intersect.obj knotvector.obj \
    27        mapdesc.obj mapdescv.obj maplist.obj mesher.obj monotonizer.obj \
    28        mycode.obj nurbsinterfac.obj nurbstess.obj patch.obj patchlist.obj \
    29        quilt.obj reader.obj renderhints.obj slicer.obj sorter.obj \
    30        splitarcs.obj subdivider.obj tobezier.obj trimline.obj trimregion.obj \
    31        trimvertpool.obj uarray.obj varray.obj dataTransform.obj \
    32        monoTriangulationBackend.obj
     27CINCLUDE    = -I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I..\..\include
     28CDEFS       = -DSTANDALONE -DLIBRARYBUILD -DNDEBUG
    3329
    34 all: $(OBJS)
     30CFLAGS      = $(CFLAGS) $(CINCLUDE) $(CDEFS)
     31CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE) $(CDEFS)
    3532
    3633
     34# Object files. All objects should be prefixed with $(OBJDIR)!
     35OBJS = \
     36$(OBJDIR)\arc.obj \
     37$(OBJDIR)\arcsorter.obj \
     38$(OBJDIR)\arctess.obj \
     39$(OBJDIR)\backend.obj \
     40$(OBJDIR)\basiccrveval.obj \
     41$(OBJDIR)\basicsurfeval.obj \
     42$(OBJDIR)\bin.obj \
     43$(OBJDIR)\bufpool.obj \
     44$(OBJDIR)\cachingeval.obj \
     45$(OBJDIR)\ccw.obj \
     46$(OBJDIR)\coveandtiler.obj \
     47$(OBJDIR)\curve.obj \
     48$(OBJDIR)\curvelist.obj \
     49$(OBJDIR)\curvesub.obj \
     50$(OBJDIR)\displaylist.obj \
     51$(OBJDIR)\flist.obj \
     52$(OBJDIR)\flistsorter.obj \
     53$(OBJDIR)\hull.obj \
     54$(OBJDIR)\intersect.obj \
     55$(OBJDIR)\knotvector.obj \
     56$(OBJDIR)\mapdesc.obj \
     57$(OBJDIR)\mapdescv.obj \
     58$(OBJDIR)\maplist.obj \
     59$(OBJDIR)\mesher.obj \
     60$(OBJDIR)\monotonizer.obj \
     61$(OBJDIR)\mycode.obj
     62
     63OBJS2 = \
     64$(OBJDIR)\nurbsinterfac.obj \
     65$(OBJDIR)\nurbstess.obj \
     66$(OBJDIR)\patch.obj \
     67$(OBJDIR)\patchlist.obj \
     68$(OBJDIR)\quilt.obj \
     69$(OBJDIR)\reader.obj \
     70$(OBJDIR)\renderhints.obj \
     71$(OBJDIR)\slicer.obj \
     72$(OBJDIR)\sorter.obj \
     73$(OBJDIR)\splitarcs.obj \
     74$(OBJDIR)\subdivider.obj \
     75$(OBJDIR)\tobezier.obj \
     76$(OBJDIR)\trimline.obj \
     77$(OBJDIR)\trimregion.obj \
     78$(OBJDIR)\trimvertpool.obj \
     79$(OBJDIR)\uarray.obj \
     80$(OBJDIR)\varray.obj \
     81$(OBJDIR)\dataTransform.obj \
     82$(OBJDIR)\monoTriangulationBackend.obj
     83
     84
     85# Target name - name of the library without extention and path.
     86TARGET = internals
     87
     88
     89# Create all libraries (not importlibraries)
     90all:    $(OBJDIR) \
     91        $(OBJDIR)\$(TARGET).lib
     92
     93
     94# Create all libraries (not importlibraries)
     95libs: all
     96
     97
     98# Lib rule - build importlibrary (and evt. other libs)
     99$(OBJDIR)\$(TARGET).lib: $(OBJS) $(OBJS2)
     100    $(RM) $@
     101    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
     102    $(ILIB) $(ILIBFLAGS) $@ $(OBJS2);
     103
     104
     105# Dep rule - makes depenencies for C, C++ and Asm files.
    37106dep:
    38107    $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc  \
    39108        ..\nurbtess\*.h ..\..\..\mesa\GL\*.h ..\..\include\*.h
    40109
    41 !ifndef NODEP
    42 !include .depend
    43 !endif
    44110
     111# Includes the common rules.
     112!include $(PDWIN32_INCLUDE)/pdwin32.post
    45113
    46 clean:
    47     $(RM) *.obj *.pch
    48 
  • trunk/src/opengl/glu/nurbs/makefile

    r3010 r3031  
    1 # $Id: makefile,v 1.5 2000-03-04 19:59:20 bird Exp $
     1# $Id: makefile,v 1.6 2000-03-06 23:33:48 bird Exp $
     2
    23#
    3 # PD-Win32 API
     4# Odin32 API
    45#
    56#       glu/nurbs makefile
    67#
    78
     9# Directory macros.
    810PDWIN32_INCLUDE = ..\..\..\..\include
    911PDWIN32_LIB     = ..\..\..\..\lib
    10 PDWIN32_BIN     = ..\..\..\..\bin
     12PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
    1113PDWIN32_TOOLS   = ..\..\..\..\tools\bin
    1214
    1315
     16# Compiler, tools, and interference rules.
    1417!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1518
    1619
    17 all:
     20# All, libs, dep and clean rule.
     21clean dep all libs:
    1822    cd interface
    19     $(MAKE_CMD)
     23    $(MAKE_CMD) $@
    2024    cd ..\internals
    21     $(MAKE_CMD)
     25    $(MAKE_CMD) $@
    2226    cd ..\nurbtess
    23     $(MAKE_CMD)
     27    $(MAKE_CMD) $@
    2428    cd ..
    2529
    26 
    27 dep:
    28     cd interface
    29     $(MAKE_CMD) dep
    30     cd ..\internals
    31     $(MAKE_CMD) dep
    32     cd ..\nurbtess
    33     $(MAKE_CMD) dep
    34     cd ..
    35 
    36 
    37 clean:
    38     cd interface
    39     $(MAKE_CMD) clean
    40     cd ..\internals
    41     $(MAKE_CMD) clean
    42     cd ..\nurbtess
    43     $(MAKE_CMD) clean
    44     cd ..
    45 
  • trunk/src/opengl/glu/nurbs/nurbtess/makefile

    r2945 r3031  
    1 # $Id: makefile,v 1.3 2000-02-29 13:56:49 sandervl Exp $
     1# $Id: makefile,v 1.4 2000-03-06 23:33:49 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       glu/nurbs/nurbtess makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\..\..\..\include
    10 PDWIN32_LIB = ..\..\..\..\..\lib
    11 PDWIN32_BIN = ..\..\..\..\..\bin
    12 PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
     11PDWIN32_LIB     = ..\..\..\..\..\lib
     12PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
    1314
    1415
     16# Local cleanup only.
     17LOCALCLEAN = 1
     18
     19
     20# Compiler, tools, and interference rules.
    1521!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1622
    1723
    18 CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I$(PDWIN32_INCLUDE) -I..\..\include
     24# Flag overloads and local macros.
     25CLEANEXTRAS =
    1926
    20 CFLAGS = $(CFLAGS) $(CINCLUDE) -DNDEBUG
    21 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
    22 
    23 OBJS = directedLine.obj gridWrap.obj monoTriangulation.obj partitionY.obj \
    24        polyDBG.obj polyUtil.obj primitiveStream.obj quicksort.obj \
    25        rectBlock.obj sampleComp.obj sampleCompBot.obj sampleCompRight.obj \
    26        sampleCompTop.obj sampleMonoPoly.obj sampledLine.obj searchTree.obj \
    27        partitionX.obj monoChain.obj monoPolyPart.obj
    28 
    29 all: $(OBJS)
     27CINCLUDE    = -I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I..\..\include
     28CFLAGS      = $(CFLAGS) $(CINCLUDE) -DNDEBUG
     29CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
    3030
    3131
     32# Object files. All objects should be prefixed with $(OBJDIR)!
     33OBJS = \
     34$(OBJDIR)\directedLine.obj \
     35$(OBJDIR)\gridWrap.obj \
     36$(OBJDIR)\monoTriangulation.obj \
     37$(OBJDIR)\partitionY.obj \
     38$(OBJDIR)\polyDBG.obj \
     39$(OBJDIR)\polyUtil.obj \
     40$(OBJDIR)\primitiveStream.obj \
     41$(OBJDIR)\quicksort.obj \
     42$(OBJDIR)\rectBlock.obj \
     43$(OBJDIR)\sampleComp.obj \
     44$(OBJDIR)\sampleCompBot.obj \
     45$(OBJDIR)\sampleCompRight.obj \
     46$(OBJDIR)\sampleCompTop.obj \
     47$(OBJDIR)\sampleMonoPoly.obj \
     48$(OBJDIR)\sampledLine.obj \
     49$(OBJDIR)\searchTree.obj \
     50$(OBJDIR)\partitionX.obj \
     51$(OBJDIR)\monoChain.obj \
     52$(OBJDIR)\monoPolyPart.obj
     53
     54
     55# Target name - name of the library without extention and path.
     56TARGET = nurbtess
     57
     58
     59# Create all libraries (not importlibraries)
     60all:    $(OBJDIR) \
     61        $(OBJDIR)\$(TARGET).lib
     62
     63
     64# Create all libraries (not importlibraries)
     65libs: all
     66
     67
     68# Lib rule - build importlibrary (and evt. other libs)
     69$(OBJDIR)\$(TARGET).lib: $(OBJS)
     70    $(RM) $@
     71    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
     72
     73
     74# Dep rule - makes depenencies for C, C++ and Asm files.
    3275dep:
    3376    $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc  \
    3477        ..\..\mesa\*.h ..\nurbtess\*.h ..\internals\*.h ..\..\include\*.h
    3578
    36 !ifndef NODEP
    37 !include .depend
    38 !endif
    3979
     80# Includes the common rules.
     81!include $(PDWIN32_INCLUDE)/pdwin32.post
    4082
    41 clean:
    42     $(RM) *.obj *.pch
    43 
  • trunk/src/opengl/glu/tess/makefile

    r2945 r3031  
    1 # $Id: makefile,v 1.3 2000-02-29 13:56:50 sandervl Exp $
     1# $Id: makefile,v 1.4 2000-03-06 23:33:50 bird Exp $
     2
    23#
    3 # PD-Win32 API
     4# Odin32 API
    45#
    56#       glu/tess makefile
    67#
    78
     9# Directory macros.
    810PDWIN32_INCLUDE = ..\..\..\..\include
    9 PDWIN32_LIB = ..\..\..\..\lib
    10 PDWIN32_BIN = ..\..\..\..\bin
    11 PDWIN32_TOOLS = ..\..\..\..\tools\bin
     11PDWIN32_LIB     = ..\..\..\..\lib
     12PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\..\..\tools\bin
    1214
    1315
     16# Local cleanup only.
     17LOCALCLEAN = 1
     18
     19
     20# Compiler, tools, and interference rules.
    1421!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1522
    16 CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include -I..\..\mesa\GL
    17 CDEFS=-DNDEBUG -Tdp
    1823
    19 CFLAGS = $(CFLAGS) $(CINCLUDE) $(CDEFS) -DNDEBUG
    20 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -$(CDEFS) -DNDEBUG
     24# Flag overloads and local macros.
     25CLEANEXTRAS =
    2126
    22 OBJS= dict.obj memalloc.obj mesh.obj normal.obj priorityq.obj \
    23       render.obj sweep.obj tess.obj tessmono.obj geom.obj
    24 
    25 all: $(OBJS)
     27CINCLUDE    = -I.. -I..\..\mesa -I..\include -I..\..\mesa\GL
     28CDEFS       = -DNDEBUG -Tdp
     29CFLAGS      = $(CFLAGS) $(CINCLUDE) $(CDEFS) -DNDEBUG
     30CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE) -$(CDEFS) -DNDEBUG
    2631
    2732
     33
     34# Object files. All objects should be prefixed with $(OBJDIR)!
     35OBJS= \
     36$(OBJDIR)\dict.obj \
     37$(OBJDIR)\memalloc.obj \
     38$(OBJDIR)\mesh.obj \
     39$(OBJDIR)\normal.obj \
     40$(OBJDIR)\priorityq.obj \
     41$(OBJDIR)\render.obj \
     42$(OBJDIR)\sweep.obj \
     43$(OBJDIR)\tess.obj \
     44$(OBJDIR)\tessmono.obj \
     45$(OBJDIR)\geom.obj
     46
     47
     48# Target name - name of the library without extention and path.
     49TARGET = tess
     50
     51
     52# Create all libraries (not importlibraries)
     53all:    $(OBJDIR) \
     54        $(OBJDIR)\$(TARGET).lib
     55
     56
     57# Create all libraries (not importlibraries)
     58libs: all
     59
     60
     61# Lib rule - build importlibrary (and evt. other libs)
     62$(OBJDIR)\$(TARGET).lib: $(OBJS)
     63    $(RM) $@
     64    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
     65
     66
     67# Dep rule - makes depenencies for C, C++ and Asm files.
    2868dep:
    2969    $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc  \
    3070        ..\..\mesa\*.h ..\*.h ..\include\*.h
    3171
    32 !ifndef NODEP
    33 !include .depend
    34 !endif
    3572
     73# Includes the common rules.
     74!include $(PDWIN32_INCLUDE)/pdwin32.post
    3675
    37 clean:
    38     $(RM) *.obj
  • trunk/src/opengl/glu/util/makefile

    r2945 r3031  
    1 # $Id: makefile,v 1.3 2000-02-29 13:56:50 sandervl Exp $
     1# $Id: makefile,v 1.4 2000-03-06 23:33:50 bird Exp $
     2
    23#
    3 # PD-Win32 API
     4# Odin32 API
    45#
    56#       glu/util makefile
    67#
    78
     9# Directory macros.
    810PDWIN32_INCLUDE = ..\..\..\..\include
    9 PDWIN32_LIB = ..\..\..\..\lib
    10 PDWIN32_BIN = ..\..\..\..\bin
    11 PDWIN32_TOOLS = ..\..\..\..\tools\bin
     11PDWIN32_LIB     = ..\..\..\..\lib
     12PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\..\..\tools\bin
    1214
    1315
     16# Local cleanup only.
     17LOCALCLEAN = 1
     18
     19
     20# Compiler, tools, and interference rules.
    1421!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1522
    16 CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include -I..\..\mesa\GL
    1723
    18 CFLAGS = $(CFLAGS) $(CINCLUDE) -Tdp -DNDEBUG
    19 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)  -Tdp -DNDEBUG
     24# Flag overloads and local macros.
     25CLEANEXTRAS =
    2026
    21 OBJS= error.obj glue.obj mipmap.obj project.obj quad.obj registry.obj
    22 
    23 all: $(OBJS)
     27CINCLUDE    = -I.. -I..\..\mesa -I..\include -I..\..\mesa\GL
     28CFLAGS      = $(CFLAGS) $(CINCLUDE) -Tdp -DNDEBUG
     29CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)  -Tdp -DNDEBUG
    2430
    2531
     32# Object files. All objects should be prefixed with $(OBJDIR)!
     33OBJS = \
     34$(OBJDIR)\error.obj \
     35$(OBJDIR)\glue.obj \
     36$(OBJDIR)\mipmap.obj \
     37$(OBJDIR)\project.obj \
     38$(OBJDIR)\quad.obj \
     39$(OBJDIR)\registry.obj
     40
     41
     42# Target name - name of the library without extention and path.
     43TARGET = util
     44
     45
     46# Create all libraries (not importlibraries)
     47all:    $(OBJDIR) \
     48        $(OBJDIR)\$(TARGET).lib
     49
     50
     51# Create all libraries (not importlibraries)
     52libs: all
     53
     54
     55# Lib rule - build importlibrary (and evt. other libs)
     56$(OBJDIR)\$(TARGET).lib: $(OBJS)
     57    $(RM) $@
     58    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
     59
     60
     61# Dep rule - makes depenencies for C, C++ and Asm files.
    2662dep:
    2763    $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc \
    2864        ..\include\*.h ..\..\mesa\*.h ..\*.h
    2965
    30 !ifndef NODEP
    31 !include .depend
    32 !endif
    3366
     67# Includes the common rules.
     68!include $(PDWIN32_INCLUDE)/pdwin32.post
    3469
    35 clean:
    36     $(RM) *.obj *.lib *.map
  • trunk/src/opengl/glut/Makefile

    r3022 r3031  
    1 # $Id: Makefile,v 1.10 2000-03-05 10:19:37 jeroen Exp $
     1# $Id: Makefile,v 1.11 2000-03-06 23:33:11 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       glut32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\..\include
    10 PDWIN32_LIB = ..\..\..\lib
    11 PDWIN32_BIN = ..\..\..\bin
    12 PDWIN32_TOOLS = ..\..\..\tools\bin
     11PDWIN32_LIB     = ..\..\..\lib
     12PDWIN32_BIN     = ..\..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS   = -Tdp -I..\mesa\GL -I..\glu $(CFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa
    19 CXXFLAGS = -Tdp -I..\mesa\GL -I..\glu $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa
     20# Flag overloads and local macros.
     21CLEANEXTRAS = 32rsrc.asm
    2022
    21 TARGET=GLUT32
    22 
    23 all: $(TARGET).DLL $(TARGET).LIB
    24 
    25 OBJS = glut_8x13.obj glut_9x15.obj glut_bitmap.obj glut_bwidth.obj glut_cindex.obj \
    26        glut_cmap.obj glut_cursor.obj glut_dials.obj glut_dstr.obj glut_event.obj \
    27        glut_ext.obj glut_fullscrn.obj glut_gamemode.obj glut_get.obj glut_hel10.obj \
    28        glut_hel12.obj glut_hel18.obj glut_init.obj glut_input.obj glut_joy.obj glut_key.obj \
    29        glut_keyctrl.obj glut_keyup.obj glut_mesa.obj glut_modifier.obj glut_mroman.obj \
    30        glut_overlay.obj glut_roman.obj glut_shapes.obj glut_space.obj glut_stroke.obj \
    31        glut_swap.obj glut_swidth.obj glut_tablet.obj glut_teapot.obj glut_tr10.obj \
    32        glut_tr24.obj glut_util.obj glut_vidresize.obj glut_warp.obj glut_win.obj \
    33        glut_winmisc.obj win32_glx.obj win32_menu.obj win32_util.obj win32_winproc.obj \
    34        win32_x11.obj glut_term.obj initterm.obj resource.obj
    35 
    36 all: $(TARGET).DLL
    37 
    38 $(TARGET).DLL: $(OBJS) $(TARGET).def $(TARGET).lrf
    39     $(LD2) $(LD2FLAGS) /FREE @$(TARGET).lrf
    40     $(CP) $@ $(PDWIN32_BIN)
     23CFLAGS      = -Tdp -I..\mesa\GL -I..\glu $(CFLAGS) -I..\mesa
     24CXXFLAGS    = -Tdp -I..\mesa\GL -I..\glu $(CXXFLAGS) -I..\mesa
    4125
    4226
    43 $(TARGET).lrf: makefile
    44     @echo Creating file <<$(@B).lrf
     27# Object files. All objects should be prefixed with $(OBJDIR)!
     28OBJS = \
     29$(OBJDIR)\glut_8x13.obj \
     30$(OBJDIR)\glut_9x15.obj \
     31$(OBJDIR)\glut_bitmap.obj \
     32$(OBJDIR)\glut_bwidth.obj \
     33$(OBJDIR)\glut_cindex.obj \
     34$(OBJDIR)\glut_cmap.obj \
     35$(OBJDIR)\glut_cursor.obj \
     36$(OBJDIR)\glut_dials.obj \
     37$(OBJDIR)\glut_dstr.obj \
     38$(OBJDIR)\glut_event.obj \
     39$(OBJDIR)\glut_ext.obj \
     40$(OBJDIR)\glut_fullscrn.obj \
     41$(OBJDIR)\glut_gamemode.obj \
     42$(OBJDIR)\glut_get.obj \
     43$(OBJDIR)\glut_hel10.obj \
     44$(OBJDIR)\glut_hel12.obj \
     45$(OBJDIR)\glut_hel18.obj \
     46$(OBJDIR)\glut_init.obj \
     47$(OBJDIR)\glut_input.obj \
     48$(OBJDIR)\glut_joy.obj \
     49$(OBJDIR)\glut_key.obj \
     50$(OBJDIR)\glut_keyctrl.obj \
     51$(OBJDIR)\glut_keyup.obj \
     52$(OBJDIR)\glut_mesa.obj \
     53$(OBJDIR)\glut_modifier.obj \
     54$(OBJDIR)\glut_mroman.obj \
     55$(OBJDIR)\glut_overlay.obj \
     56$(OBJDIR)\glut_roman.obj \
     57$(OBJDIR)\glut_shapes.obj \
     58$(OBJDIR)\glut_space.obj \
     59$(OBJDIR)\glut_stroke.obj \
     60$(OBJDIR)\glut_swap.obj \
     61$(OBJDIR)\glut_swidth.obj \
     62$(OBJDIR)\glut_tablet.obj \
     63$(OBJDIR)\glut_teapot.obj \
     64$(OBJDIR)\glut_tr10.obj \
     65$(OBJDIR)\glut_tr24.obj \
     66$(OBJDIR)\glut_util.obj \
     67$(OBJDIR)\glut_vidresize.obj \
     68$(OBJDIR)\glut_warp.obj \
     69$(OBJDIR)\glut_win.obj \
     70$(OBJDIR)\glut_winmisc.obj \
     71$(OBJDIR)\win32_glx.obj \
     72$(OBJDIR)\win32_menu.obj \
     73$(OBJDIR)\win32_util.obj \
     74$(OBJDIR)\win32_winproc.obj \
     75$(OBJDIR)\win32_x11.obj \
     76$(OBJDIR)\glut_term.obj \
     77$(OBJDIR)\initterm.obj \
     78$(OBJDIR)\glut32rsrc.obj
     79
     80
     81# Target name - name of the dll without extention and path.
     82TARGET  = glut32
     83
     84
     85# All rule - build objs, target dll, copies dll to bin and makes libs.
     86all:    $(OBJDIR) \
     87        $(OBJDIR)\$(TARGET).dll \
     88        $(PDWIN32_BIN)\$(TARGET).dll \
     89        lib
     90
     91
     92# Lib rule - build importlibrary (and evt. other libs)
     93lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
     94
     95
     96# Dll rule - builds the target dll.
     97$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     98    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
     99
     100
     101# Linker file - creates the parameter file passed on to the linker.
     102$(OBJDIR)\$(TARGET).lrf: makefile
     103    @echo Creating file <<$@
    45104$(OBJS)
    46 /OUT:$(TARGET).DLL /DLL
    47105$(PDWIN32_LIB)\ODINCRT.LIB
    48106$(RTLLIB_O)
     
    58116
    59117
    60 $(TARGET).lib: $(TARGET)exp.def
    61     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    62     $(CP) $@ $(PDWIN32_LIB)
    63 
    64 $(TARGET)exp.def: $(TARGET).def
    65     $(IMPDEF) $** $@
    66 
    67 
    68 resource.asm: $(TARGET).rc
    69     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
    70 
    71 
     118# Dep rule - makes depenencies for C, C++ and Asm files.
    72119dep:
    73120    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win -I..\mesa\GL \
    74121        *.c *.cpp *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    75122
    76 !ifndef NODEP
    77 !include .depend
    78 !endif
    79123
     124# Includes the common rules.
     125!include $(PDWIN32_INCLUDE)/pdwin32.post
    80126
    81 clean:
    82     $(RM) *.obj *.lib *.dll *.map *.lrf *exp.def resource.asm \
    83         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib
  • trunk/src/opengl/makefile

    r3014 r3031  
    1 # $Id: makefile,v 1.16 2000-03-04 20:18:05 bird Exp $
     1# $Id: makefile,v 1.17 2000-03-06 23:33:42 bird Exp $
    22#
    3 # PD-Win32 API
     3# Odin32 API
    44#
    55#       opengl32.dll makefile
    66#
    77
     8# Directories
    89PDWIN32_INCLUDE = ..\..\include
    9 PDWIN32_LIB = ..\..\lib
    10 PDWIN32_BIN = ..\..\bin
    11 PDWIN32_TOOLS = ..\..\tools\bin
     10
     11# Common tools macros. (MAKE_CMD)
     12!include $(PDWIN32_INCLUDE)\pdwin32.mk
    1213
    1314
    14 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     15# dummy all rule - invoking nmake withtout target caused it to do all of the targets below..
     16_all: all
    1517
    1618
    17 #SvL: Only build the release version of glide, mesa & glu(t)
    18 #     There's no need for debug (even without dbg info) builds in the daily build archive
    19 # MAKE_CMD=nmake
    20 #KSO: Don't work as we use to have DEBUG defined as an enviroment variable.
    21 #     I have updated the opengl makefiles to consider NODEBUGINFO. If you don't wan't
    22 #     any debuginfo you could now add NODEBUGINFO=1 to MAKE_CMD.
    23 
    24 CFLAGS   = $(CFLAGS)   -I$(PDWIN32_INCLUDE)
    25 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
    26 
    27 #TARGET1  = opengl32
    28 #DTARGET1 = opengl32
    29 TARGET2  = glu\glu32
    30 DTARGET2 = glu32
    31 TARGET3  = glut\glut32
    32 DTARGET3 = glut32
    33 TARGET4  = glide
    34 DTARGET4 = glide2x
    35 TARGET5  = mesa
    36 DTARGET5 = opengl32
    37 TARGET6  = 3dfxmesa
    38 
    39 #OBJS1=  opengl32.obj initterm.obj resource.obj
    40 
    41 #all: $(TARGET1).dll $(TARGET1).lib \
    42 all: $(TARGET5) $(TARGET2).dll $(TARGET2).lib \
    43      $(TARGET3).dll $(TARGET3).lib $(TARGET4) $(TARGET6)
    44 
    45 #$(TARGET1).dll: $(OBJS1) $(TARGET1).def
    46 #    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS1) $(TARGET1).def \
    47 #          $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/kernel32.lib \
    48 #          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
    49 #          OS2386.LIB $(RTLLIB_O)
    50 #    $(CP) $@ $(PDWIN32_BIN)
    51 
    52 
    53 #$(TARGET1).lib: $(TARGET1)exp.def
    54 #    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET1)exp.def
    55 #    $(CP) $@ $(PDWIN32_LIB)
    56 
    57 #$(TARGET1)exp.def: $(TARGET1).def
    58 #    $(IMPDEF) $** $@
    59 
    60 
    61 #resource.asm: $(TARGET1).rc
    62 #    $(RC) $(RCFLAGS) -o resource.asm $(TARGET1).rc
    63 
    64 
    65 $(TARGET2).dll:
    66     cd glu
    67     $(MAKE_CMD)
    68     cd ..
    69 
    70 $(TARGET3).dll:
    71     cd glut
    72     $(MAKE_CMD)
    73     cd ..
    74 
    75 
    76 $(TARGET2).lib:
    77     cd glu
    78     $(MAKE_CMD) $(@F)
    79     cd ..
    80 
    81 
    82 $(TARGET3).lib:
    83     cd glut
    84     $(MAKE_CMD) $(@F)
    85     cd ..
    86 
    87 
    88 $(TARGET4):
    89     cd glide
    90     $(MAKE_CMD)
    91     cd ..
    92 
    93 $(TARGET5):
     19# All, Lib, Clean and Dep rules.
     20clean dep all lib:
    9421    cd mesa
    95     $(MAKE_CMD)
    96     cd ..
    97 
    98 $(TARGET6):
    99     cd mesa\3dfx
    100     $(MAKE_CMD)
     22    $(MAKE_CMD) $@
     23    cd ..\glu
     24    $(MAKE_CMD) $@
     25    cd ..\glut
     26    $(MAKE_CMD) $@
     27    cd ..\glide
     28    $(MAKE_CMD) $@
     29    cd ..\mesa\3dfx
     30    $(MAKE_CMD) $@
    10131    cd ..\..
    10232
    103 #lib: $(TARGET1).lib $(PDWIN32_LIB)\$(DTARGET1).lib \
    104 lib: $(TARGET2).lib $(PDWIN32_LIB)\$(DTARGET2).lib \
    105      $(TARGET3).lib $(PDWIN32_LIB)\$(DTARGET3).lib \
    106      $(PDWIN32_LIB)\$(DTARGET4).lib \
    107      $(PDWIN32_LIB)\$(DTARGET5).lib
    108 
    109 #$(PDWIN32_LIB)\$(DTARGET1).lib: $(TARGET1).lib
    110 #    $(CP) $** $@
    111 
    112 $(PDWIN32_LIB)\$(DTARGET2).lib: $(TARGET2).lib
    113     $(CP) $** $@
    114 
    115 $(PDWIN32_LIB)\$(DTARGET3).lib: $(TARGET3).lib
    116     $(CP) $** $@
    117 
    118 $(PDWIN32_LIB)\$(DTARGET4).lib:
    119     cd glide
    120     $(MAKE_CMD) lib
    121     cd ..
    122 
    123 $(PDWIN32_LIB)\$(DTARGET5).lib:
    124     cd mesa
    125     $(MAKE_CMD) lib
    126     cd ..
    127 
    128 dep:
    129     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    130         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    131     cd glut
    132     $(MAKE_CMD) dep
    133     cd ..\glu
    134     $(MAKE_CMD) dep
    135     cd ..\glide
    136     $(MAKE_CMD) dep
    137     cd ..\mesa
    138     $(MAKE_CMD) dep
    139     cd 3dfx
    140     $(MAKE_CMD) dep
    141     cd ..\..
    142 
    143 !ifndef NODEP
    144 !include .depend
    145 !endif
    146 
    147 
    148 clean:
    149     $(RM) *.obj *.lib *.dll *.map resource.asm *exp.def
    150     cd glut
    151     $(MAKE_CMD) clean
    152     cd ..\glu
    153     $(MAKE_CMD) clean
    154     cd ..\glide
    155     $(MAKE_CMD) clean
    156     cd ..\mesa
    157     $(MAKE_CMD) clean
    158     cd 3dfx
    159     $(MAKE_CMD) clean
    160     cd ..\..
    161 
  • trunk/src/opengl/mesa/3dfx/makefile

    r3001 r3031  
    1 # $Id: makefile,v 1.5 2000-03-04 19:41:39 bird Exp $
     1# $Id: makefile,v 1.6 2000-03-06 23:33:51 bird Exp $
    22#
    33# PD-Win32
     
    66#
    77
     8# Directory macros.
    89PDWIN32_INCLUDE = ..\..\..\..\include
    910PDWIN32_LIB = ..\..\..\..\lib
     
    1112PDWIN32_TOOLS = ..\..\..\..\tools\bin
    1213
     14
     15# Compiler, tools, and interference rules.
    1316!include $(PDWIN32_INCLUDE)/pdwin32.mk
    14 
    1517MESADEFS= -DNO_PARALLEL -DNO_STEREO -DGL_MESA_window_pos -DTHREADS \
    1618          -DUSE_X86_ASM_NOT -DUSE_MMX_ASM_NOT -DUSE_3DNOW_ASM_NOT \
    1719          -DFX -DFX_V2 -DFX_SILENT -DBUILD_GL32
    1820
    19 CFLAGS   = -I.. -I..\GL $(CFLAGS_WIN32APP) -I$(PDWIN32_INCLUDE) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS) /Wcnd- /Tdp
    20 CXXFLAGS = -I.. -I..\GL $(CXXFLAGS_WIN32APP) -I$(PDWIN32_INCLUDE) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS)
     21CFLAGS   = -I.. -I..\GL $(CFLAGS_WIN32APP) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS) /Wcnd- /Tdp
     22CXXFLAGS = -I.. -I..\GL $(CXXFLAGS_WIN32APP) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS)
    2123
    22 TARGET = OPENGL32
    2324
    24 all: $(TARGET).DLL
     25#
     26# Interference rule for sources in the parent directory.
     27#
     28{..}.c{$(OBJDIR)}.obj:
     29    $(CC) $(CFLAGS) -c -Fo$(OBJDIR)\$(@B).obj $<
    2530
    26 OBJS =  fxapi.obj \
    27     fxcva.obj \
    28     fxclip.obj \
    29     fxdd.obj \
    30     fxddspan.obj \
    31     fxddtex.obj \
    32     fxglidew.obj \
    33     fxfastpath.obj \
    34     fxpipeline.obj \
    35     fxrender.obj \
    36     fxsanity.obj \
    37     fxsetup.obj \
    38     fxtexman.obj \
    39     fxtrifuncs.obj \
    40     fxvsetup.obj \
    41     fxwgl.obj initterm.obj resource.obj \
    42     accum.obj alpha.obj alphabuf.obj api1.obj api2.obj apiext.obj \
    43     attrib.obj bbox.obj bitmap.obj blend.obj clip.obj colortab.obj config.obj context.obj \
    44     copypix.obj cva.obj depth.obj dlist.obj drawpix.obj enable.obj enums.obj eval.obj \
    45     extensions.obj feedback.obj fog.obj get.obj glmisc.obj hash.obj image.obj light.obj \
    46     lines.obj logic.obj masking.obj matrix.obj mmath.obj mthreads.obj pb.obj pipeline.obj \
    47     pixel.obj pointers.obj points.obj polygon.obj quads.obj rastpos.obj readpix.obj \
    48     rect.obj scissor.obj shade.obj span.obj stages.obj stencil.obj teximage.obj texobj.obj texstate.obj \
    49     texture.obj translate.obj triangle.obj varray.obj vb.obj vbcull.obj vbfill.obj \
    50     vbindirect.obj vbrender.obj vbxform.obj vector.obj vertices.obj winpos.obj xform.obj zoom.obj \
    51     osmesa.obj
    5231
    53 $(TARGET).DLL: $(OBJS) $(TARGET).lrf $(TARGET).def
    54     -$(LD2) $(LD2FLAGS) /FREE /NOE @$(TARGET).lrf
    55     $(CP) $@ $(PDWIN32_BIN)\Glide
     32# Object files. All objects should be prefixed with $(OBJDIR)!
     33OBJS = \
     34$(OBJDIR)\fxapi.obj \
     35$(OBJDIR)\fxcva.obj \
     36$(OBJDIR)\fxclip.obj \
     37$(OBJDIR)\fxdd.obj \
     38$(OBJDIR)\fxddspan.obj \
     39$(OBJDIR)\fxddtex.obj \
     40$(OBJDIR)\fxglidew.obj \
     41$(OBJDIR)\fxfastpath.obj \
     42$(OBJDIR)\fxpipeline.obj \
     43$(OBJDIR)\fxrender.obj \
     44$(OBJDIR)\fxsanity.obj \
     45$(OBJDIR)\fxsetup.obj \
     46$(OBJDIR)\fxtexman.obj \
     47$(OBJDIR)\fxtrifuncs.obj \
     48$(OBJDIR)\fxvsetup.obj \
     49$(OBJDIR)\fxwgl.obj \
     50$(OBJDIR)\initterm.obj \
     51$(OBJDIR)\fxmesa32.obj \
     52$(OBJDIR)\accum.obj \
     53$(OBJDIR)\alpha.obj \
     54$(OBJDIR)\alphabuf.obj \
     55$(OBJDIR)\api1.obj \
     56$(OBJDIR)\api2.obj \
     57$(OBJDIR)\apiext.obj \
     58$(OBJDIR)\attrib.obj \
     59$(OBJDIR)\bbox.obj \
     60$(OBJDIR)\bitmap.obj \
     61$(OBJDIR)\blend.obj \
     62$(OBJDIR)\clip.obj \
     63$(OBJDIR)\colortab.obj \
     64$(OBJDIR)\config.obj \
     65$(OBJDIR)\context.obj \
     66$(OBJDIR)\copypix.obj \
     67$(OBJDIR)\cva.obj \
     68$(OBJDIR)\depth.obj \
     69$(OBJDIR)\dlist.obj \
     70$(OBJDIR)\drawpix.obj \
     71$(OBJDIR)\enable.obj \
     72$(OBJDIR)\enums.obj \
     73$(OBJDIR)\eval.obj \
     74$(OBJDIR)\extensions.obj \
     75$(OBJDIR)\feedback.obj \
     76$(OBJDIR)\fog.obj \
     77$(OBJDIR)\get.obj \
     78$(OBJDIR)\glmisc.obj \
     79$(OBJDIR)\hash.obj \
     80$(OBJDIR)\image.obj \
     81$(OBJDIR)\light.obj \
     82$(OBJDIR)\lines.obj \
     83$(OBJDIR)\logic.obj \
     84$(OBJDIR)\masking.obj \
     85$(OBJDIR)\matrix.obj \
     86$(OBJDIR)\mmath.obj \
     87$(OBJDIR)\mthreads.obj \
     88$(OBJDIR)\pb.obj \
     89$(OBJDIR)\pipeline.obj \
     90$(OBJDIR)\pixel.obj \
     91$(OBJDIR)\pointers.obj \
     92$(OBJDIR)\points.obj \
     93$(OBJDIR)\polygon.obj \
     94$(OBJDIR)\quads.obj \
     95$(OBJDIR)\rastpos.obj \
     96$(OBJDIR)\readpix.obj \
     97$(OBJDIR)\rect.obj \
     98$(OBJDIR)\scissor.obj \
     99$(OBJDIR)\shade.obj \
     100$(OBJDIR)\span.obj \
     101$(OBJDIR)\stages.obj \
     102$(OBJDIR)\stencil.obj \
     103$(OBJDIR)\teximage.obj \
     104$(OBJDIR)\texobj.obj \
     105$(OBJDIR)\texstate.obj \
     106$(OBJDIR)\texture.obj \
     107$(OBJDIR)\translate.obj \
     108$(OBJDIR)\triangle.obj \
     109$(OBJDIR)\varray.obj \
     110$(OBJDIR)\vb.obj \
     111$(OBJDIR)\vbcull.obj \
     112$(OBJDIR)\vbfill.obj \
     113$(OBJDIR)\vbindirect.obj \
     114$(OBJDIR)\vbrender.obj \
     115$(OBJDIR)\vbxform.obj \
     116$(OBJDIR)\vector.obj \
     117$(OBJDIR)\vertices.obj \
     118$(OBJDIR)\winpos.obj \
     119$(OBJDIR)\xform.obj \
     120$(OBJDIR)\zoom.obj \
     121$(OBJDIR)\osmesa.obj
    56122
    57 $(TARGET).lrf: makefile
    58   @echo Creating file <<$(@B).lrf
     123
     124# Target name - name of the dll without extention and path.
     125TARGET = opengl32
     126
     127
     128# All rule - build objs, target dll, copies dll to bin and makes libs.
     129all:    $(OBJDIR) \
     130        $(OBJDIR)\$(TARGET).dll \
     131        $(PDWIN32_BIN)\$(TARGET).dll \
     132        lib
     133
     134
     135# Lib rule - build importlibrary (and evt. other libs)
     136lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
     137
     138
     139# Dll rule - builds the target dll.
     140$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     141    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
     142
     143
     144# Linker file - creates the parameter file passed on to the linker.
     145$(OBJDIR)\$(TARGET).lrf: makefile
     146    @echo Creating file <<$@
     147/OUT:$(OBJDIR)\$(TARGET).dll
     148/MAP:$(OBJDIR)\$(TARGET).map
    59149$(OBJS)
    60 /OUT:$(TARGET).DLL
    61150$(PDWIN32_LIB)\ODINCRT.LIB
    62151$(PDWIN32_LIB)\KERNEL32.LIB
     
    69158<<keep
    70159
    71 resource.asm: fxmesa32.rc
    72     $(RC) $(RCFLAGS) -o resource.asm fxmesa32.rc
    73160
    74 #
    75 # Tried to create a general interference rule for these?
    76 # As long as there isn't any .c, .cpp or .asm files with matching
    77 # names in the current directory thise shouldn't be any problem.
    78 # For example:
    79 #   {..}.c.obj:
    80 #       $(CC) $(CFLAGS) -c $<
    81 #
    82 # Regards knut.
    83 #
    84 
    85 accum.obj: ..\accum.c
    86     $(CC) $(CFLAGS) -c ..\accum.c
    87 
    88 alpha.obj: ..\alpha.c
    89     $(CC) $(CFLAGS) -c ..\alpha.c
    90 alphabuf.obj: ..\alphabuf.c
    91     $(CC) $(CFLAGS) -c ..\alphabuf.c
    92 api1.obj: ..\api1.c
    93     $(CC) $(CFLAGS) -c ..\api1.c
    94 api2.obj: ..\api2.c
    95     $(CC) $(CFLAGS) -c ..\api2.c
    96 apiext.obj: ..\apiext.c
    97     $(CC) $(CFLAGS) -c ..\apiext.c
    98 attrib.obj: ..\attrib.c
    99     $(CC) $(CFLAGS) -c ..\attrib.c
    100 bbox.obj: ..\bbox.c
    101     $(CC) $(CFLAGS) -c ..\bbox.c
    102 bitmap.obj: ..\bitmap.c
    103     $(CC) $(CFLAGS) -c ..\bitmap.c
    104 blend.obj: ..\blend.c
    105     $(CC) $(CFLAGS) -c ..\blend.c
    106 clip.obj: ..\clip.c
    107     $(CC) $(CFLAGS) -c ..\clip.c
    108 colortab.obj: ..\colortab.c
    109     $(CC) $(CFLAGS) -c ..\colortab.c
    110 config.obj: ..\config.c
    111     $(CC) $(CFLAGS) -c ..\config.c
    112 context.obj: ..\context.c
    113     $(CC) $(CFLAGS) -c ..\context.c
    114 copypix.obj: ..\copypix.c
    115     $(CC) $(CFLAGS) -c ..\copypix.c
    116 cva.obj: ..\cva.c
    117     $(CC) $(CFLAGS) -c ..\cva.c
    118 depth.obj: ..\depth.c
    119     $(CC) $(CFLAGS) -c ..\depth.c
    120 dlist.obj: ..\dlist.c
    121     $(CC) $(CFLAGS) -c ..\dlist.c
    122 drawpix.obj: ..\drawpix.c
    123     $(CC) $(CFLAGS) -c ..\drawpix.c
    124 enable.obj: ..\enable.c
    125     $(CC) $(CFLAGS) -c ..\enable.c
    126 enums.obj: ..\enums.c
    127     $(CC) $(CFLAGS) -c ..\enums.c
    128 eval.obj: ..\eval.c
    129     $(CC) $(CFLAGS) -c ..\eval.c
    130 extensions.obj: ..\extensions.c
    131     $(CC) $(CFLAGS) -c ..\extensions.c
    132 feedback.obj: ..\feedback.c
    133     $(CC) $(CFLAGS) -c ..\feedback.c
    134 fog.obj: ..\fog.c
    135     $(CC) $(CFLAGS) -c ..\fog.c
    136 get.obj: ..\get.c
    137     $(CC) $(CFLAGS) -c ..\get.c
    138 glmisc.obj: ..\glmisc.c
    139     $(CC) $(CFLAGS) -c ..\glmisc.c
    140 hash.obj: ..\hash.c
    141     $(CC) $(CFLAGS) -c ..\hash.c
    142 image.obj: ..\image.c
    143     $(CC) $(CFLAGS) -c ..\image.c
    144 light.obj: ..\light.c
    145     $(CC) $(CFLAGS) -c ..\light.c
    146 lines.obj: ..\lines.c
    147     $(CC) $(CFLAGS) -c ..\lines.c
    148 logic.obj: ..\logic.c
    149     $(CC) $(CFLAGS) -c ..\logic.c
    150 masking.obj: ..\masking.c
    151     $(CC) $(CFLAGS) -c ..\masking.c
    152 matrix.obj: ..\matrix.c
    153     $(CC) $(CFLAGS) -c ..\matrix.c
    154 mmath.obj: ..\mmath.c
    155     $(CC) $(CFLAGS) -c ..\mmath.c
    156 mthreads.obj: ..\mthreads.c
    157     $(CC) $(CFLAGS) -c ..\mthreads.c
    158 pb.obj: ..\pb.c
    159     $(CC) $(CFLAGS) -c ..\pb.c
    160 pipeline.obj: ..\pipeline.c
    161     $(CC) $(CFLAGS) -c ..\pipeline.c
    162 pixel.obj: ..\pixel.c
    163     $(CC) $(CFLAGS) -c ..\pixel.c
    164 pointers.obj: ..\pointers.c
    165     $(CC) $(CFLAGS) -c ..\pointers.c
    166 points.obj: ..\points.c
    167     $(CC) $(CFLAGS) -c ..\points.c
    168 polygon.obj: ..\polygon.c
    169     $(CC) $(CFLAGS) -c ..\polygon.c
    170 quads.obj: ..\quads.c
    171     $(CC) $(CFLAGS) -c ..\quads.c
    172 rastpos.obj: ..\rastpos.c
    173     $(CC) $(CFLAGS) -c ..\rastpos.c
    174 readpix.obj: ..\readpix.c
    175     $(CC) $(CFLAGS) -c ..\readpix.c
    176 rect.obj: ..\rect.c
    177     $(CC) $(CFLAGS) -c ..\rect.c
    178 scissor.obj: ..\scissor.c
    179     $(CC) $(CFLAGS) -c ..\scissor.c
    180 shade.obj: ..\shade.c
    181     $(CC) $(CFLAGS) -c ..\shade.c
    182 span.obj: ..\span.c
    183     $(CC) $(CFLAGS) -c ..\span.c
    184 stages.obj: ..\stages.c
    185     $(CC) $(CFLAGS) -c ..\stages.c
    186 stencil.obj: ..\stencil.c
    187     $(CC) $(CFLAGS) -c ..\stencil.c
    188 teximage.obj: ..\teximage.c
    189     $(CC) $(CFLAGS) -c ..\teximage.c
    190 texobj.obj: ..\texobj.c
    191     $(CC) $(CFLAGS) -c ..\texobj.c
    192 texstate.obj: ..\texstate.c
    193     $(CC) $(CFLAGS) -c ..\texstate.c
    194 texture.obj: ..\texture.c
    195     $(CC) $(CFLAGS) -c ..\texture.c
    196 translate.obj: ..\translate.c
    197     $(CC) $(CFLAGS) -c ..\translate.c
    198 triangle.obj: ..\triangle.c
    199     $(CC) $(CFLAGS) -c ..\triangle.c
    200 varray.obj: ..\varray.c
    201     $(CC) $(CFLAGS) -c ..\varray.c
    202 vb.obj: ..\vb.c
    203     $(CC) $(CFLAGS) -c ..\vb.c
    204 vbcull.obj: ..\vbcull.c
    205     $(CC) $(CFLAGS) -c ..\vbcull.c
    206 vbfill.obj: ..\vbfill.c
    207     $(CC) $(CFLAGS) -c ..\vbfill.c
    208 vbindirect.obj: ..\vbindirect.c
    209     $(CC) $(CFLAGS) -c ..\vbindirect.c
    210 vbrender.obj: ..\vbrender.c
    211     $(CC) $(CFLAGS) -c ..\vbrender.c
    212 vbxform.obj: ..\vbxform.c
    213     $(CC) $(CFLAGS) -c ..\vbxform.c
    214 vector.obj: ..\vector.c
    215     $(CC) $(CFLAGS) -c ..\vector.c
    216 vertices.obj: ..\vertices.c
    217     $(CC) $(CFLAGS) -c ..\vertices.c
    218 winpos.obj: ..\winpos.c
    219     $(CC) $(CFLAGS) -c ..\winpos.c
    220 xform.obj: ..\xform.c
    221     $(CC) $(CFLAGS) -c ..\xform.c
    222 zoom.obj: ..\zoom.c
    223     $(CC) $(CFLAGS) -c ..\zoom.c
    224 osmesa.obj: ..\osmesa.c
    225     $(CC) $(CFLAGS) -c ..\osmesa.c
    226 wmesa.obj: ..\wmesa.obj
    227     $(CC) $(CFLAGS) -c ..\osmesa.obj
    228 internal.obj: ..\internal.c
    229     $(CC) $(CFLAGS) -c ..\internal.c
    230 
    231 
     161# Dep rule - makes depenencies for C, C++ and Asm files.
    232162dep:
    233163    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win -I..\..\glut -I..\GL -I.. -I$(PDWIN32_INCLUDE)\glide \
    234164        *.c *.cpp *.h *.asm *.inc ..\*.c $(PDWIN32_INCLUDE)\*.h
    235165
    236 !ifndef NODEP
    237 !include .depend
    238 !endif
    239166
    240 clean:
    241     $(RM) *.obj *.dll *.lib *.lrf resource.asm $(PDWIN32_BIN)\$(TARGET).dll \
    242         $(PDWIN32_LIB)\$(TARGET).lib
     167# Includes the common rules.
     168!include $(PDWIN32_INCLUDE)/pdwin32.post
    243169
  • trunk/src/pe2lx/makefile

    r604 r3031  
    1 # $Id: makefile,v 1.9 1999-08-21 12:29:30 sandervl Exp $
     1# $Id: makefile,v 1.10 2000-03-06 23:38:55 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 #       pe2lx.exe makefile
     6#       pe2lx.exe makefile
     7#
     8# WARNING: This is the old PE2LX. The new Pe2Lx is found in src\win32k\pe2lx.
    79#
    810
     
    3133
    3234$(TARGET).exe: $(OBJS)
    33         $(LD) $(LDFLAGS) -Fe$@ $(OBJS) \
     35        $(LD) $(LDFLAGS) -Fe$@ $(OBJS) \
    3436        $(PDWIN32_LIB)\LIBCONV.LIB $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    3537        $(CP) $(TARGET).exe $(PDWIN32_BIN)
     
    6365
    6466clean:
    65         $(RM) *.obj *.lib *.dll *~ *.map *.pch *.exe
    66         $(RM) $(PDWIN32_BIN)\$(TARGET).exe
     67        $(RM) *.obj *.lib *.dll *~ *.map *.pch *.exe
     68        $(RM) $(PDWIN32_BIN)\$(TARGET).exe
  • trunk/src/peldr/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.14 2000-02-09 23:47:01 bird Exp $
     1# $Id: makefile,v 1.15 2000-03-06 23:38:55 bird Exp $
    22
    33#
     
    77#
    88
     9# Tell that we're producing an executable
     10EXETARGET = 1
     11
     12# Directory macros.
    913PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     14PDWIN32_LIB     = ..\..\lib
     15PDWIN32_BIN     = ..\..\$(OBJDIR)
     16PDWIN32_TOOLS   = ..\..\tools\bin
    1317
     18
     19# Compiler, tools, and interference rules.
    1420!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1521
    16 CFLAGS   = $(CFLAGS) /Ge+ -I$(PDWIN32_INCLUDE) -Gn-
    17 CXXFLAGS = $(CXXFLAGS) /Ge+ -I$(PDWIN32_INCLUDE) -Gn-
    18 LDFLAGS  = $(LDFLAGS_ODINCRT) /Ge+ /B"/pmtype:pm /stack:0x100000 /NOBASE /Map" \
    19            os2386.lib
     22
     23# Flag overloads and local macros.
     24CLEANEXTRAS = $(PDWIN32_BIN)\$(TARGET).exe
    2025
    2126
     27# Object files. All objects should be prefixed with $(OBJDIR)!
     28OBJS = $(OBJDIR)\pe.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = pe
    2333
    24 OBJS =  pe.obj
    2534
    26 all: $(TARGET).exe
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).exe \
     38        $(PDWIN32_BIN)\$(TARGET).exe
    2739
    2840
    29 $(TARGET).exe: $(OBJS) makefile
    30     $(LD) $(LDFLAGS) -Fe$@ $(OBJS)
    31     $(CP) $(TARGET).exe $(PDWIN32_BIN)
    32     $(CP) $@ $(PDWIN32_BIN)
     41# Lib rule - dummy rule.
     42lib:
    3343
    3444
     45# Exe rule - builds the target exe.
     46$(OBJDIR)\$(TARGET).exe: $(OBJS) $(OBJDIR)\$(TARGET).lrf
     47    $(LD2) $(LD2FLAGS_ODINCRT) @$(OBJDIR)\$(TARGET).lrf
     48
     49
     50# Linker file - creates the parameter file passed on to the linker.
     51$(OBJDIR)\$(TARGET).lrf: makefile
     52    @echo Creating file <<$@
     53/OUT:$(OBJDIR)\$(TARGET).exe
     54/MAP:$(OBJDIR)\$(TARGET).map
     55/PMTYPE:pm
     56/STACK:0x100000
     57/NOBASE
     58$(OBJS)
     59os2386.lib
     60<<keep
     61
     62
     63# Dep rule - makes depenencies for C, C++ and Asm files.
    3564dep:
    3665    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    3766        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    3867
    39 !ifndef NODEP
    40 !include .depend
    41 !endif
    4268
     69# Includes the common rules.
     70!include $(PDWIN32_INCLUDE)/pdwin32.post
    4371
    44 clean:
    45     $(RM) *.obj *.lib *.dll *.map *.pch *.exe \
    46         $(PDWIN32_BIN)\$(TARGET).exe
    47 
  • trunk/src/psapi/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.7 2000-02-09 23:47:01 bird Exp $
     1# $Id: makefile,v 1.8 2000-03-06 23:38:55 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       psapi.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = psapirsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\psapi.obj \
     27$(OBJDIR)\psapirsrc.obj \
     28$(PDWIN32_LIB)/dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = psapi
    2333
    24 OBJS =  psapi.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2534
    26 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2740
    2841
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3444
    3545
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
    41 $(TARGET).lib: $(TARGET)exp.def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    43     $(CP) $@ $(PDWIN32_LIB)
    44 
    45 $(TARGET)exp.def: $(TARGET).def
    46     $(IMPDEF) $** $@
    47 
    48 resource.asm: $(TARGET).rc
    49     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    5049
    5150
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)/kernel32.lib
     58$(PDWIN32_LIB)/odincrt.lib
     59OS2386.LIB
     60$(RTLLIB_O)
     61$(TARGET).def
     62<<keep
     63
     64
     65# Dep rule - makes depenencies for C, C++ and Asm files.
    5266dep:
    5367    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5468        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5569
    56 !ifndef NODEP
    57 !include .depend
    58 !endif
    5970
     71# Includes the common rules.
     72!include $(PDWIN32_INCLUDE)/pdwin32.post
    6073
    61 clean:
    62     $(RM) *.obj *.lib *.dll *.map *.pch \
    63         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    64         resource.asm $(TARGET)exp.def
    65 
    66 
    67 
    68 
    69 
  • trunk/src/rasapi32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.8 2000-02-09 23:47:02 bird Exp $
     1# $Id: makefile,v 1.9 2000-03-06 23:38:56 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       rasapi32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = rasapi32rsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\rasapi32.obj \
     27$(OBJDIR)\rasapi32rsrc.obj \
     28$(PDWIN32_LIB)\dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = rasapi32
    2333
    24 OBJS =  rasapi32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2534
    26 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2740
    2841
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3444
    3545
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
    41 $(TARGET).lib: $(TARGET)exp.def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    43     $(CP) $@ $(PDWIN32_LIB)
    44 
    45 $(TARGET)exp.def: $(TARGET).def
    46     $(IMPDEF) $** $@
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4749
    4850
    49 resource.asm: $(TARGET).rc
    50     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)/kernel32.lib
     58$(PDWIN32_LIB)/odincrt.lib
     59OS2386.LIB
     60$(RTLLIB_O)
     61$(TARGET).def
     62<<keep
    5163
    5264
     65# Dep rule - makes depenencies for C, C++ and Asm files.
    5366dep:
    5467    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5568        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5669
    57 !ifndef NODEP
    58 !include .depend
    59 !endif
    6070
     71# Includes the common rules.
     72!include $(PDWIN32_INCLUDE)/pdwin32.post
    6173
    62 clean:
    63     $(RM) *.obj *.lib *.dll *.map *.pch \
    64         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    65         resource.asm $(TARGET)exp.def
    66 
    67 
    68 
    69 
    70 
    71 
  • trunk/src/shell32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.21 2000-02-09 23:47:02 bird Exp $
     1# $Id: makefile,v 1.22 2000-03-06 23:38:57 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       shell32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    14 
     15# Compiler, tools, and interference rules.
    1516!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1617
     18# Flag overloads and local macros.
     19CLEANEXTRAS = shres.asm
    1720
    1821CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    1922CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
    2023
     24
     25# Object files. All objects should be prefixed with $(OBJDIR)!
     26OBJS =  \
     27$(OBJDIR)\initterm.obj \
     28$(OBJDIR)\brsfolder.obj \
     29$(OBJDIR)\classes.obj \
     30$(OBJDIR)\contmenu.obj \
     31$(OBJDIR)\dataobject.obj \
     32$(OBJDIR)\enumidlist.obj \
     33$(OBJDIR)\folders.obj \
     34$(OBJDIR)\iconcache.obj \
     35$(OBJDIR)\memorystream.obj \
     36$(OBJDIR)\pidl.obj \
     37$(OBJDIR)\regstream.obj \
     38$(OBJDIR)\shell32_main.obj \
     39$(OBJDIR)\shellguid.obj \
     40$(OBJDIR)\shelllink.obj \
     41$(OBJDIR)\shlmenu.obj \
     42$(OBJDIR)\shellole.obj \
     43$(OBJDIR)\shellord.obj \
     44$(OBJDIR)\shellpath.obj \
     45$(OBJDIR)\shv_bg_cmenu.obj \
     46$(OBJDIR)\shlfolder.obj \
     47$(OBJDIR)\shlview.obj \
     48$(OBJDIR)\shell.obj \
     49$(OBJDIR)\unknown.obj \
     50$(OBJDIR)\misc.obj \
     51$(OBJDIR)\she.obj \
     52$(OBJDIR)\sh.obj \
     53$(OBJDIR)\shpolicy.obj \
     54$(OBJDIR)\shres.obj
     55
     56
     57# Target name - name of the dll without extention and path.
    2158TARGET = shell32
    2259
    23 OBJS =  initterm.obj \
    24         brsfolder.obj classes.obj contmenu.obj dataobject.obj \
    25         enumidlist.obj folders.obj iconcache.obj memorystream.obj \
    26         pidl.obj regstream.obj shell32_main.obj \
    27         shellguid.obj shelllink.obj shlmenu.obj shellole.obj \
    28         shellord.obj shellpath.obj shv_bg_cmenu.obj \
    29         shlfolder.obj shlview.obj shell.obj unknown.obj misc.obj \
    30         she.obj sh.obj resource.obj shpolicy.obj
    3160
    32 all: $(TARGET).dll $(TARGET).lib
     61# All rule - build objs, target dll, copies dll to bin and makes libs.
     62all:    $(OBJDIR) \
     63        $(OBJDIR)\$(TARGET).dll \
     64        $(PDWIN32_BIN)\$(TARGET).dll \
     65        lib
    3366
    3467
    35 $(TARGET).dll: $(OBJS) $(TARGET).def
    36     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    37           $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
    38           $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/advapi32.lib \
    39           $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/ole32.lib  \
    40           $(PDWIN32_LIB)/version.lib $(PDWIN32_LIB)/comctl32.lib   \
    41           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    42     $(CP) $@ $(PDWIN32_BIN)
     68# Lib rule - build importlibrary (and evt. other libs)
     69lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    4370
    4471
    45 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    46 
    47 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    48     $(CP) $** $@
    49 
    50 $(TARGET).lib: $(TARGET)exp.def
    51     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    52     $(CP) $@ $(PDWIN32_LIB)
    53 
    54 $(TARGET)exp.def: $(TARGET).def
    55     $(IMPDEF) $** $@
     72# Dll rule - builds the target dll.
     73$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     74    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    5675
    5776
    58 resource.asm: shres.rc shell32_en.rc
    59     $(RC) $(RCFLAGS) -o resource.asm shres.rc
     77# Linker file - creates the parameter file passed on to the linker.
     78$(OBJDIR)\$(TARGET).lrf: makefile
     79    @echo Creating file <<$@
     80/OUT:$(OBJDIR)\$(TARGET).dll
     81/MAP:$(OBJDIR)\$(TARGET).map
     82$(OBJS)
     83$(PDWIN32_LIB)/pmwinx.lib
     84$(PDWIN32_LIB)/kernel32.lib
     85$(PDWIN32_LIB)/user32.lib
     86$(PDWIN32_LIB)/advapi32.lib
     87$(PDWIN32_LIB)/gdi32.lib
     88$(PDWIN32_LIB)/ole32.lib
     89$(PDWIN32_LIB)/version.lib
     90$(PDWIN32_LIB)/comctl32.lib
     91$(PDWIN32_LIB)/odincrt.lib
     92OS2386.LIB
     93$(RTLLIB_O)
     94$(TARGET).def
     95<<keep
    6096
    6197
     98# Dep rule - makes depenencies for C, C++ and Asm files.
    6299dep:
    63100    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    64101        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    65102
    66 !ifndef NODEP
    67 !include .depend
    68 !endif
    69103
     104# Includes the common rules.
     105!include $(PDWIN32_INCLUDE)/pdwin32.post
    70106
    71 clean:
    72     $(RM) *.obj *.lib *.dll *.map *.pch \
    73         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    74         resource.asm $(TARGET)exp.def
    75 
  • trunk/src/shlwapi/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.9 2000-02-09 23:47:02 bird Exp $
     1# $Id: makefile,v 1.10 2000-03-06 23:39:09 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       shlwapi.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = shlwapirsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\shlwapi.obj \
     27$(OBJDIR)\shlwapirsrc.obj \
     28$(PDWIN32_LIB)/dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = shlwapi
    2333
    24 OBJS =  shlwapi.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2534
    26 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2740
    2841
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/shell32.lib OS2386.LIB $(RTLLIB_O)
    33     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3444
    3545
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
    41 $(TARGET).lib: $(TARGET)exp.def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    43     $(CP) $@ $(PDWIN32_LIB)
    44 
    45 $(TARGET)exp.def: $(TARGET).def
    46     $(IMPDEF) $** $@
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4749
    4850
    49 resource.asm: $(TARGET).rc
    50     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)/kernel32.lib
     58$(PDWIN32_LIB)/odincrt.lib
     59$(PDWIN32_LIB)/shell32.lib
     60OS2386.LIB
     61$(RTLLIB_O)
     62$(TARGET).def
     63<<keep
    5164
    5265
     66# Dep rule - makes depenencies for C, C++ and Asm files.
    5367dep:
    5468    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5569        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5670
    57 !ifndef NODEP
    58 !include .depend
    59 !endif
    6071
     72# Includes the common rules.
     73!include $(PDWIN32_INCLUDE)/pdwin32.post
    6174
    62 clean:
    63     $(RM) *.obj *.lib *.dll *.map *.pch \
    64         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    65         resource.asm $(TARGET)exp.def
    66 
  • trunk/src/tapi32/makefile

    r2730 r3031  
    1 # $Id: makefile,v 1.13 2000-02-10 01:23:30 bird Exp $
     1# $Id: makefile,v 1.14 2000-03-06 23:39:10 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       tapi32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = tapi32rsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\tapi32.obj \
     27$(OBJDIR)\tapi32rsrc.obj \
     28$(PDWIN32_LIB)\dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = tapi32
    2333
    24 OBJS =  tapi32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2534
    26 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2740
    2841
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
    33           OS2386.LIB $(RTLLIB_O)
    34     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3544
    3645
    37 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    38 
    39 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    40     $(CP) $** $@
    41 
    42 $(TARGET).lib: $(TARGET)exp.def
    43     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    44     $(CP) $@ $(PDWIN32_LIB)
    45 
    46 $(TARGET)exp.def: $(TARGET).def
    47     $(IMPDEF) $** $@
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4849
    4950
    50 resource.asm: $(TARGET).rc
    51     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)/kernel32.lib
     58$(PDWIN32_LIB)/user32.lib
     59$(PDWIN32_LIB)/odincrt.lib
     60OS2386.LIB
     61$(RTLLIB_O)
     62$(TARGET).def
     63<<keep
    5264
    5365
     66# Dep rule - makes depenencies for C, C++ and Asm files.
    5467dep:
    5568    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5669        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5770
    58 !ifndef NODEP
    59 !include .depend
    60 !endif
    6171
     72# Includes the common rules.
     73!include $(PDWIN32_INCLUDE)/pdwin32.post
    6274
    63 clean:
    64     $(RM) *.obj *.lib *.dll *.map *.pch \
    65         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    66         resource.asm $(TARGET)exp.def
    67 
    68 
  • trunk/src/twain_32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.4 2000-02-09 23:47:03 bird Exp $
     1# $Id: makefile,v 1.5 2000-03-06 23:39:11 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       twain_32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE) -DWIN32
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -DWIN32
     20# Flag overloads and local macros.
     21CLEANEXTRAS = twain_32rsrc.asm
     22
     23CFLAGS = $(CFLAGS) -DWIN32
     24CXXFLAGS = $(CXXFLAGS) -DWIN32
    2025
    2126
     27# Object files. All objects should be prefixed with $(OBJDIR)!
     28OBJS = \
     29$(OBJDIR)\twain_32.obj \
     30$(OBJDIR)\initterm.obj \
     31$(OBJDIR)\twain_32rsrc.obj
     32
     33
     34# Target name - name of the dll without extention and path.
    2235TARGET = twain_32
    2336
    24 OBJS =   twain_32.obj initterm.obj resource.obj
     37
     38# All rule - build objs, target dll, copies dll to bin and makes libs.
     39all:    $(OBJDIR) \
     40        $(OBJDIR)\$(TARGET).dll \
     41        $(PDWIN32_BIN)\$(TARGET).dll \
     42        lib
    2543
    2644
    27 all: $(TARGET).dll $(TARGET).lib
     45# Lib rule - build importlibrary (and evt. other libs)
     46lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    2847
    2948
    30 $(TARGET).dll: $(OBJS) $(TARGET).def
    31     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    32           $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
    33           $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    34     $(CP) $@ $(PDWIN32_BIN)
     49# Dll rule - builds the target dll.
     50$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     51    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    3552
    3653
    37 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    38 
    39 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    40     $(CP) $** $@
    41 
    42 $(TARGET).lib: $(TARGET)exp.def
    43     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    44     $(CP) $@ $(PDWIN32_LIB)
    45 
    46 $(TARGET)exp.def: $(TARGET).def
    47     $(IMPDEF) $** $@
     54# Linker file - creates the parameter file passed on to the linker.
     55$(OBJDIR)\$(TARGET).lrf: makefile
     56    @echo Creating file <<$@
     57/OUT:$(OBJDIR)\$(TARGET).dll
     58/MAP:$(OBJDIR)\$(TARGET).map
     59$(OBJS)
     60$(PDWIN32_LIB)/pmwinx.lib
     61$(PDWIN32_LIB)/kernel32.lib
     62$(PDWIN32_LIB)/user32.lib
     63$(PDWIN32_LIB)/odincrt.lib
     64OS2386.LIB
     65$(RTLLIB_O)
     66$(TARGET).def
     67<<keep
    4868
    4969
    50 resource.asm: twain_32.rc
    51     $(RC) $(RCFLAGS) -o resource.asm twain_32.rc
    52 
    53 
     70# Dep rule - makes depenencies for C, C++ and Asm files.
    5471dep:
    5572    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5673        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5774
    58 !ifndef NODEP
    59 !include .depend
    60 !endif
    6175
     76# Includes the common rules.
     77!include $(PDWIN32_INCLUDE)/pdwin32.post
    6278
    63 clean:
    64     $(RM) *.obj *.lib *.dll *.map *.pch resource.asm \
    65         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    66         $(TARGET)exp.def
    67 
    68 
    69 
  • trunk/src/user32/Makefile

    r3019 r3031  
    1 # $Id: Makefile,v 1.67 2000-03-04 23:47:19 sandervl Exp $
     1# $Id: Makefile,v 1.68 2000-03-06 23:39:12 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       user32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    1011PDWIN32_LIB     = ..\..\lib
    11 PDWIN32_BIN     = ..\..\bin
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
    1213PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    14 #SvL: Remove this when everything has been converted to the new build rules
    15 NEWBUILD=1
    1615
     16# Compiler, tools, and interference rules.
    1717!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1818
    19 RESOURCES= resource
    20 CFLAGS   = $(CFLAGS)   -I$(PDWIN32_INCLUDE)
    21 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
    2219
    23 TARGET = user32
     20# Flag overloads and local macros.
     21CLEANEXTRAS = user32rsrc.asm
    2422
     23
     24# Object files. All objects should be prefixed with $(OBJDIR)!
    2525OBJS = \
    2626$(OBJDIR)\user32.obj \
     
    8484$(OBJDIR)\dbglocal.obj \
    8585$(OBJDIR)\caret.obj \
    86 $(OBJDIR)\$(RESOURCES).obj \
    8786$(OBJDIR)\winproc.obj \
    8887$(OBJDIR)\text.obj \
     
    9190$(OBJDIR)\windlg.obj \
    9291$(OBJDIR)\win32wdesktop.obj \
    93 $(OBJDIR)\win32wbasenonclient.obj
     92$(OBJDIR)\win32wbasenonclient.obj \
     93$(OBJDIR)\user32rsrc.obj
    9494
    95 all: $(OBJDIR) $(TARGET).dll $(TARGET).lib
    9695
    97 $(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
    98         $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    99         $(CP) $@ $(PDWIN32_BIN)
     96# Target name - name of the dll without extention and path.
     97TARGET = user32
    10098
     99
     100# All rule - build objs, target dll, copies dll to bin and makes libs.
     101all:    $(OBJDIR) \
     102        $(OBJDIR)\$(TARGET).dll \
     103        $(PDWIN32_BIN)\$(TARGET).dll \
     104        lib
     105
     106
     107# Lib rule - build importlibrary (and evt. other libs)
     108lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
     109
     110
     111# Dll rule - builds the target dll.
     112$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     113    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
     114
     115
     116# Linker file - creates the parameter file passed on to the linker.
    101117$(OBJDIR)\$(TARGET).lrf: makefile
    102         @echo Creating file <<$(OBJDIR)\$(@B).lrf
     118        @echo Creating file <<$@
     119/OUT:$(OBJDIR)\$(TARGET).dll
     120/MAP:$(OBJDIR)\$(TARGET).map
    103121$(OBJS)
    104122$(PDWIN32_LIB)/pmwinx.lib
     
    113131
    114132
    115 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    116 
    117 
    118 $(RESOURCES).asm: user32.rc
    119     $(RC) $(RCFLAGS) -o $(RESOURCES).asm user32.rc
    120 
     133# Dep rule - makes depenencies for C, C++ and Asm files.
    121134dep:
    122135    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    123136        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    124137
     138
     139# Includes the common rules.
    125140!include $(PDWIN32_INCLUDE)/pdwin32.post
    126141
  • trunk/src/version/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.12 2000-02-09 23:47:04 bird Exp $
     1# $Id: makefile,v 1.13 2000-03-06 23:39:14 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       version.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = versionrsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\version.obj \
     27$(OBJDIR)\install.obj \
     28$(OBJDIR)\info.obj \
     29$(OBJDIR)\versionrsrc.obj \
     30$(PDWIN32_LIB)\dllentry.obj
     31
     32
     33# Target name - name of the dll without extention and path.
    2234TARGET = version
    2335
    24 OBJS =  version.obj resource.obj install.obj info.obj $(PDWIN32_LIB)/dllentry.obj
    2536
    26 all: $(TARGET).dll $(TARGET).lib
     37# All rule - build objs, target dll, copies dll to bin and makes libs.
     38all:    $(OBJDIR) \
     39        $(OBJDIR)\$(TARGET).dll \
     40        $(PDWIN32_BIN)\$(TARGET).dll \
     41        lib
    2742
    2843
    29 $(TARGET).dll: $(OBJS) $(TARGET).def $(TARGET)exp.def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
    33           $(PDWIN32_LIB)/crtdll.lib \
    34           $(PDWIN32_LIB)/lz32.lib OS2386.LIB $(RTLLIB_O)
    35     $(CP) $@ $(PDWIN32_BIN)
     44# Lib rule - build importlibrary (and evt. other libs)
     45lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3646
    3747
    38 
    39 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    40 
    41 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    42     $(CP) $** $@
    43 
    44 $(TARGET).lib: $(TARGET)exp.def
    45     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    46     $(CP) $@ $(PDWIN32_LIB)
    47 
    48 $(TARGET)exp.def: $(TARGET).def
    49     $(IMPDEF) $** $@
     48# Dll rule - builds the target dll.
     49$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     50    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    5051
    5152
    52 resource.asm: $(TARGET).rc
    53     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     53# Linker file - creates the parameter file passed on to the linker.
     54$(OBJDIR)\$(TARGET).lrf: makefile
     55    @echo Creating file <<$@
     56/OUT:$(OBJDIR)\$(TARGET).dll
     57/MAP:$(OBJDIR)\$(TARGET).map
     58$(OBJS)
     59$(PDWIN32_LIB)/kernel32.lib
     60$(PDWIN32_LIB)/user32.lib
     61$(PDWIN32_LIB)/odincrt.lib
     62$(PDWIN32_LIB)/crtdll.lib
     63$(PDWIN32_LIB)/lz32.lib
     64OS2386.LIB
     65$(RTLLIB_O)
     66$(TARGET).def
     67<<keep
    5468
    5569
     70# Dep rule - makes depenencies for C, C++ and Asm files.
    5671dep:
    5772    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5873        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5974
    60 !ifndef NODEP
    61 !include .depend
    62 !endif
    6375
     76# Includes the common rules.
     77!include $(PDWIN32_INCLUDE)/pdwin32.post
    6478
    65 clean:
    66     $(RM) *.obj *.lib *.dll *.map *.pch \
    67         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    68         resource.asm $(TARGET)exp.def
    69 
  • trunk/src/wing32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.6 2000-02-09 23:47:04 bird Exp $
     1# $Id: makefile,v 1.7 2000-03-06 23:39:15 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66# wing32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
     15
     16# Compiler, tools, and interference rules.
    1417!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1518
    16 ASFLAGS = -Sc -Sv:ALP
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE);
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE);
    20 
    21 TARGET = wing32
    22 
    23 OBJS =   initterm.obj wing32.obj resource.obj
    24 
    25 LIBS =  $(PDWIN32_LIB)\user32.lib $(PDWIN32_LIB)\gdi32.lib $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = lz32rsrc.asm
     22ASFLAGS     = -Sc -Sv:ALP
    2623
    2724
    28 all: $(TARGET).dll $(TARGET).lib
     25# Object files. All objects should be prefixed with $(OBJDIR)!
     26OBJS = \
     27$(OBJDIR)\initterm.obj \
     28$(OBJDIR)\wing32.obj \
     29$(OBJDIR)\wing32rsrc.obj
    2930
    3031
    31 $(TARGET).dll: $(OBJS) $(TARGET).def
    32     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def $(LIBS)
    33     $(CP) $@ $(PDWIN32_BIN)
     32# Target name - name of the dll without extention and path.
     33TARGET  = wing32
    3434
    3535
     36# All rule - build objs, target dll, copies dll to bin and makes libs.
     37all:    $(OBJDIR) \
     38        $(OBJDIR)\$(TARGET).dll \
     39        $(PDWIN32_BIN)\$(TARGET).dll \
     40        lib
    3641
     42
     43# Lib rule - build importlibrary (and evt. other libs)
    3744lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3845
    39 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    40     $(CP) $** $@
    4146
    42 $(TARGET).lib: $(TARGET)exp.Def
    43     $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    44     $(CP) $@ $(PDWIN32_LIB)\$@
    45 
    46 $(TARGET)exp.def: $(TARGET).def
    47     $(IMPDEF) $** $@
     47# Dll rule - builds the target dll.
     48$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     49    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4850
    4951
    50 resource.asm: $(TARGET).rc
    51     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     52# Linker file - creates the parameter file passed on to the linker.
     53$(OBJDIR)\$(TARGET).lrf: makefile
     54    @echo Creating file <<$@
     55/OUT:$(OBJDIR)\$(TARGET).dll
     56/MAP:$(OBJDIR)\$(TARGET).map
     57$(OBJS)
     58$(PDWIN32_LIB)/user32.lib
     59$(PDWIN32_LIB)/gdi32.lib
     60$(PDWIN32_LIB)/kernel32.lib
     61$(PDWIN32_LIB)/odincrt.lib
     62OS2386.LIB
     63$(RTLLIB_O)
     64$(TARGET).def
     65<<keep
    5266
    5367
     68# Dep rule - makes depenencies for C, C++ and Asm files.
    5469dep:
    5570    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5671        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5772
    58 !ifndef NODEP
    59 !include .depend
    60 !endif
    6173
     74# Includes the common rules.
     75!include $(PDWIN32_INCLUDE)/pdwin32.post
    6276
    63 clean:
    64     $(RM) *.obj *.lib *.dll *.map *.pch \
    65         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    66         resource.asm $(TARGET)exp.def
    67 
  • trunk/src/wininet/makefile

    r2730 r3031  
    1 # $Id: makefile,v 1.6 2000-02-10 01:24:34 bird Exp $
     1# $Id: makefile,v 1.7 2000-03-06 23:39:16 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 #       mpr.dll makefile
     6#       wininet.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = mprrsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\wininet.obj \
     27$(OBJDIR)\ftp.obj \
     28$(OBJDIR)\utility.obj \
     29$(OBJDIR)\internet.obj \
     30$(OBJDIR)\wininetrsrc.obj \
     31$(PDWIN32_LIB)/dllentry.obj
     32
     33
     34# Target name - name of the dll without extention and path.
    2235TARGET = wininet
    2336
    24 OBJS =  wininet.obj resource.obj ftp.obj utility.obj internet.obj $(PDWIN32_LIB)/dllentry.obj
    2537
    26 all: $(TARGET).dll $(TARGET).lib
     38# All rule - build objs, target dll, copies dll to bin and makes libs.
     39all:    $(OBJDIR) \
     40        $(OBJDIR)\$(TARGET).dll \
     41        $(PDWIN32_BIN)\$(TARGET).dll \
     42        lib
    2743
    2844
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib \
    32           $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
    33           $(PDWIN32_LIB)/wsock32.lib OS2386.LIB $(RTLLIB_O)
    34     $(CP) $@ $(PDWIN32_BIN)
     45# Lib rule - build importlibrary (and evt. other libs)
     46lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3547
    3648
    37 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    38 
    39 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    40     $(CP) $** $@
    41 
    42 $(TARGET).lib: $(TARGET)exp.def
    43     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    44     $(CP) $@ $(PDWIN32_LIB)
    45 
    46 $(TARGET)exp.def: $(TARGET).def
    47     $(IMPDEF) $** $@
    48 
    49 resource.asm: $(TARGET).rc
    50     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     49# Dll rule - builds the target dll.
     50$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     51    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    5152
    5253
     54# Linker file - creates the parameter file passed on to the linker.
     55$(OBJDIR)\$(TARGET).lrf: makefile
     56    @echo Creating file <<$@
     57/OUT:$(OBJDIR)\$(TARGET).dll
     58/MAP:$(OBJDIR)\$(TARGET).map
     59$(OBJS)
     60$(PDWIN32_LIB)/kernel32.lib \
     61$(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
     62$(PDWIN32_LIB)/wsock32.lib
     63OS2386.LIB $(RTLLIB_O)
     64$(TARGET).def
     65<<keep
     66
     67
     68# Dep rule - makes depenencies for C, C++ and Asm files.
    5369dep:
    5470    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5571        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5672
    57 !ifndef NODEP
    58 !include .depend
    59 !endif
    6073
     74# Includes the common rules.
     75!include $(PDWIN32_INCLUDE)/pdwin32.post
    6176
    62 clean:
    63     $(RM) *.obj *.lib *.dll *exp.def *.map *.pch \
    64         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    65         resource.asm $(TARGET)exp.def
    66 
  • trunk/src/winmm/makefile

    r2812 r3031  
    1 # $Id: makefile,v 1.16 2000-02-17 14:09:30 sandervl Exp $
     1# $Id: makefile,v 1.17 2000-03-06 23:39:17 bird Exp $
    22
    33#
     
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = winmmrsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\os2timer.obj \
     27$(OBJDIR)\waveout.obj \
     28$(OBJDIR)\dwaveout.obj \
     29$(OBJDIR)\time.obj \
     30$(OBJDIR)\wavein.obj \
     31$(OBJDIR)\auxiliary.obj \
     32$(OBJDIR)\auxos2.obj \
     33$(OBJDIR)\mixer.obj \
     34$(OBJDIR)\midi.obj \
     35$(OBJDIR)\irtmidi.obj \
     36$(OBJDIR)\midistrm.obj \
     37$(OBJDIR)\initterm.obj \
     38$(OBJDIR)\mci.obj \
     39$(OBJDIR)\joy.obj \
     40$(OBJDIR)\mmio.obj \
     41$(OBJDIR)\driver.obj \
     42$(OBJDIR)\playsound.obj \
     43$(OBJDIR)\joyos2.obj \
     44$(OBJDIR)\winmmrsrc.obj \
     45$(OBJDIR)\dbglocal.obj
     46
     47
     48# Target name - name of the dll without extention and path.
    2249TARGET = winmm
    2350
    24 OBJS =  os2timer.obj waveout.obj dwaveout.obj time.obj \
    25         wavein.obj auxiliary.obj auxos2.obj mixer.obj \
    26         midi.obj irtmidi.obj midistrm.obj initterm.obj mci.obj joy.obj \
    27         mmio.obj driver.obj playsound.obj joyos2.obj resource.obj dbglocal.obj
     51
     52# All rule - build objs, target dll, copies dll to bin and makes libs.
     53all:    $(OBJDIR) \
     54        $(OBJDIR)\$(TARGET).dll \
     55        $(PDWIN32_BIN)\$(TARGET).dll \
     56        lib
    2857
    2958
    30 all: $(TARGET).dll $(TARGET).lib
     59# Lib rule - build importlibrary (and evt. other libs)
     60lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3161
    3262
    33 $(TARGET).dll: $(OBJS) $(TARGET).def
    34     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    35           $(PDWIN32_LIB)/pmwinx.lib mmpm2.lib  \
    36           $(PDWIN32_LIB)/kernel32.lib \
    37           $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
    38           OS2386.LIB \
    39           $(RTLLIB_O)
    40     $(CP) $@ $(PDWIN32_BIN)
     63# Dll rule - builds the target dll.
     64$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     65    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4166
    4267
    43 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    44 
    45 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    46     $(CP) $** $@
    47 
    48 $(TARGET).lib: $(TARGET)exp.def
    49     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    50     $(CP) $@ $(PDWIN32_LIB)
    51 
    52 $(TARGET)exp.def: $(TARGET).def
    53     $(IMPDEF) $** $@
     68# Linker file - creates the parameter file passed on to the linker.
     69$(OBJDIR)\$(TARGET).lrf: makefile
     70    @echo Creating file <<$@
     71/OUT:$(OBJDIR)\$(TARGET).dll
     72/MAP:$(OBJDIR)\$(TARGET).map
     73$(OBJS)
     74$(PDWIN32_LIB)/pmwinx.lib
     75mmpm2.lib
     76$(PDWIN32_LIB)/kernel32.lib
     77$(PDWIN32_LIB)/user32.lib
     78$(PDWIN32_LIB)/odincrt.lib
     79OS2386.LIB
     80$(RTLLIB_O)
     81$(TARGET).def
     82<<keep
    5483
    5584
    56 resource.asm: $(TARGET).rc
    57     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
    58 
    59 
     85# Dep rule - makes depenencies for C, C++ and Asm files.
    6086dep:
    6187    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    6288        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    6389
    64 !ifndef NODEP
    65 !include .depend
    66 !endif
    6790
     91# Includes the common rules.
     92!include $(PDWIN32_INCLUDE)/pdwin32.post
    6893
    69 clean:
    70     $(RM) *.obj *.lib *.dll *.map *.pch \
    71         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    72         resource.asm $(TARGET)exp.def
  • trunk/src/winspool/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.12 2000-02-09 23:47:05 bird Exp $
     1# $Id: makefile,v 1.13 2000-03-06 23:39:18 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       winspool.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = winspoolrsrc.asm
    2022
    2123
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\winspool.obj \
     27$(OBJDIR)\winspoolrsrc.obj \
     28$(PDWIN32_LIB)\dllentry.obj
     29
     30
     31# Target name - name of the dll without extention and path.
    2232TARGET = winspool
    2333
    24 OBJS =  winspool.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2534
    26 all: $(TARGET).dll $(TARGET).lib
     35# All rule - build objs, target dll, copies dll to bin and makes libs.
     36all:    $(OBJDIR) \
     37        $(OBJDIR)\$(TARGET).dll \
     38        $(PDWIN32_BIN)\$(TARGET).dll \
     39        lib
    2740
    2841
    29 $(TARGET).dll: $(OBJS) $(TARGET).def
    30     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    31           $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/pmwinx.lib \
    32           $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
    33           OS2386.LIB $(RTLLIB_O)
    34     $(CP) $@ $(PDWIN32_BIN)
     42# Lib rule - build importlibrary (and evt. other libs)
     43lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3544
    3645
    37 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    38 
    39 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    40     $(CP) $** $@
    41 
    42 $(TARGET).lib: $(TARGET)exp.def
    43     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    44     $(CP) $@ $(PDWIN32_LIB)
    45 
    46 $(TARGET)exp.def: $(TARGET).def
    47     $(IMPDEF) $** $@
     46# Dll rule - builds the target dll.
     47$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     48    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4849
    4950
    50 resource.asm: $(TARGET).rc
    51     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     51# Linker file - creates the parameter file passed on to the linker.
     52$(OBJDIR)\$(TARGET).lrf: makefile
     53    @echo Creating file <<$@
     54/OUT:$(OBJDIR)\$(TARGET).dll
     55/MAP:$(OBJDIR)\$(TARGET).map
     56$(OBJS)
     57$(PDWIN32_LIB)/kernel32.lib
     58$(PDWIN32_LIB)/pmwinx.lib
     59$(PDWIN32_LIB)/user32.lib
     60$(PDWIN32_LIB)/odincrt.lib
     61OS2386.LIB
     62$(RTLLIB_O)
     63$(TARGET).def
     64<<keep
    5265
    5366
     67# Dep rule - makes depenencies for C, C++ and Asm files.
    5468dep:
    5569    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5670        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5771
    58 !ifndef NODEP
    59 !include .depend
    60 !endif
    6172
     73# Includes the common rules.
     74!include $(PDWIN32_INCLUDE)/pdwin32.post
    6275
    63 clean:
    64     $(RM) *.obj *.lib *.dll *.map *.pch \
    65         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    66         resource.asm $(TARGET)exp.def
  • trunk/src/wnaspi32/makefile

    r2712 r3031  
    1 # $Id: makefile,v 1.7 2000-02-09 23:47:06 bird Exp $
     1# $Id: makefile,v 1.8 2000-03-06 23:39:18 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 #       avifil32.dll makefile
     6#       wnaspi32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
     15
     16# Compiler, tools, and interference rules.
    1417!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1518
    1619
    17 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    18 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = wnaspi32rsrc.asm
    1922
    2023
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\odinaspi.obj \
     27$(OBJDIR)\winaspi32.obj \
     28$(OBJDIR)\wnaspi32rsrc.obj \
     29$(PDWIN32_LIB)\dllentry.obj
     30
     31
     32# Target name - name of the dll without extention and path.
    2133TARGET = wnaspi32
    2234
    23 OBJS =  odinaspi.obj winaspi32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2435
    25 all: $(TARGET).dll $(TARGET).lib
     36# All rule - build objs, target dll, copies dll to bin and makes libs.
     37all:    $(OBJDIR) \
     38        $(OBJDIR)\$(TARGET).dll \
     39        $(PDWIN32_BIN)\$(TARGET).dll \
     40        lib
    2641
    2742
    28 $(TARGET).dll: $(OBJS) $(TARGET).def
    29     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    30           $(PDWIN32_LIB)/kernel32.lib \
    31           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
    32           $(PDWIN32_LIB)/advapi32.lib
    33     $(CP) $@ $(PDWIN32_BIN)
     43# Lib rule - build importlibrary (and evt. other libs)
     44lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3445
    3546
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
    41 $(TARGET).lib: $(TARGET)exp.def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    43     $(CP) $@ $(PDWIN32_LIB)
    44 
    45 $(TARGET)exp.def: $(TARGET).def
    46     $(IMPDEF) $** $@
     47# Dll rule - builds the target dll.
     48$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     49    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4750
    4851
    49 resource.asm: $(TARGET).rc
    50     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     52# Linker file - creates the parameter file passed on to the linker.
     53$(OBJDIR)\$(TARGET).lrf: makefile
     54    @echo Creating file <<$@
     55/OUT:$(OBJDIR)\$(TARGET).dll
     56/MAP:$(OBJDIR)\$(TARGET).map
     57$(OBJS)
     58$(PDWIN32_LIB)/kernel32.lib
     59$(PDWIN32_LIB)/odincrt.lib
     60OS2386.LIB
     61$(RTLLIB_O)
     62$(PDWIN32_LIB)/advapi32.lib
     63$(TARGET).def
     64<<keep
    5165
    5266
     67# Dep rule - makes depenencies for C, C++ and Asm files.
    5368dep:
    5469    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5570        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5671
    57 !ifndef NODEP
    58 !include .depend
    59 !endif
    6072
     73# Includes the common rules.
     74!include $(PDWIN32_INCLUDE)/pdwin32.post
    6175
    62 clean:
    63     $(RM) *.obj *.lib *.dll *~ *.map *.pch \
    64         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    65         resource.asm $(TARGET)exp.def
    66 
    67 
    68 
    69 
  • trunk/src/wnetap32/makefile

    r2709 r3031  
    1 # $Id: makefile,v 1.10 2000-02-09 23:40:56 bird Exp $
     1# $Id: makefile,v 1.11 2000-03-06 23:39:19 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       wnetap32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
    1415
     16# Compiler, tools, and interference rules.
    1517!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1618
    1719
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = netapi32rsrc.asm
    2022
    2123
    22 TARGET = wnetap32
    23 ORGTARGET = netapi32
    24 
    25 OBJS =  wnetap32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    26 
    27 all: $(TARGET).dll $(ORGTARGET).lib
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\wnetap32.obj \
     27$(OBJDIR)\netapi32rsrc.obj \
     28$(PDWIN32_LIB)/dllentry.obj
    2829
    2930
    30 $(TARGET).dll: $(OBJS) $(ORGTARGET).def
    31     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(ORGTARGET).def \
    32           $(PDWIN32_LIB)/kernel32.lib \
    33           $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
    34           OS2386.LIB $(RTLLIB_O)
    35     $(CP) $@ $(PDWIN32_BIN)
     31# Target and original target names - names of the dll without extention and path
     32TARGET      = wnetap32
     33ORGTARGET   = netapi32
    3634
    3735
     36# All rule - build objs, target dll, copies dll to bin and makes libs.
     37all:    $(OBJDIR) \
     38        $(OBJDIR)\$(TARGET).dll \
     39        $(PDWIN32_BIN)\$(TARGET).dll \
     40        lib
     41
     42
     43# Lib rule - build importlibrary (and evt. other libs)
    3844lib: $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
    3945
    40 $(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
    41     $(CP) $** $@
    4246
    43 $(ORGTARGET).lib: $(ORGTARGET)exp.def
    44     $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    45     $(CP) $@ $(PDWIN32_LIB)
    46 
    47 $(ORGTARGET)exp.def: $(ORGTARGET).def
    48     $(IMPDEF) $** $@
     47# Dll rule - builds the target dll.
     48$(OBJDIR)\$(TARGET).dll: $(OBJS) $(ORGTARGET).def $(OBJDIR)\$(TARGET).lrf
     49    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4950
    5051
    51 resource.asm: $(ORGTARGET).rc
    52     $(RC) $(RCFLAGS) -o resource.asm $(ORGTARGET).rc
     52# Linker file - creates the parameter file passed on to the linker.
     53$(OBJDIR)\$(TARGET).lrf: makefile
     54    @echo Creating file <<$@
     55/OUT:$(OBJDIR)\$(TARGET).dll
     56/MAP:$(OBJDIR)\$(TARGET).map
     57$(OBJS)
     58$(PDWIN32_LIB)/kernel32.lib
     59$(PDWIN32_LIB)/user32.lib
     60$(PDWIN32_LIB)/odincrt.lib
     61OS2386.LIB $(RTLLIB_O)
     62$(ORGTARGET).def
     63<<keep
    5364
    5465
     66# Dep rule - makes depenencies for C, C++ and Asm files.
    5567dep:
    5668    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5769        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5870
    59 !ifndef NODEP
    60 !include .depend
    61 !endif
    6271
     72# Includes the common rules.
     73!include $(PDWIN32_INCLUDE)/pdwin32.post
    6374
    64 clean:
    65         $(RM) *.obj *.lib *.dll *~ *.map *.pch \
    66             $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    67             resource.asm $(ORGTARGET)exp.def
    68 
  • trunk/src/wsock32/makefile

    r3009 r3031  
    1 # $Id: makefile,v 1.19 2000-03-04 19:55:39 sandervl Exp $
     1# $Id: makefile,v 1.20 2000-03-06 23:39:20 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       wsock32.dll makefile
    77#
    88
     9# Directory macros.
    910PDWIN32_INCLUDE = ..\..\include
    10 PDWIN32_LIB = ..\..\lib
    11 PDWIN32_BIN = ..\..\bin
    12 PDWIN32_TOOLS = ..\..\tools\bin
     11PDWIN32_LIB     = ..\..\lib
     12PDWIN32_BIN     = ..\..\$(OBJDIR)
     13PDWIN32_TOOLS   = ..\..\tools\bin
    1314
     15
     16# Compiler, tools, and interference rules.
    1417!include $(PDWIN32_INCLUDE)/pdwin32.mk
    1518
    1619
    17 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    18 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     20# Flag overloads and local macros.
     21CLEANEXTRAS = wsock32rsrc.asm
    1922
    2023
     24# Object files. All objects should be prefixed with $(OBJDIR)!
     25OBJS = \
     26$(OBJDIR)\wsock32.obj \
     27$(OBJDIR)\unknown.obj \
     28$(OBJDIR)\relaywin.obj \
     29$(OBJDIR)\wsock32rsrc.obj \
     30$(PDWIN32_LIB)/dllentry.obj
     31
     32
     33# Target name - name of the dll without extention and path.
    2134TARGET = wsock32
    2235
    23 OBJS =  wsock32.obj resource.obj unknown.obj relaywin.obj $(PDWIN32_LIB)/dllentry.obj
    2436
    25 all: $(TARGET).dll $(TARGET).lib
     37# All rule - build objs, target dll, copies dll to bin and makes libs.
     38all:    $(OBJDIR) \
     39        $(OBJDIR)\$(TARGET).dll \
     40        $(PDWIN32_BIN)\$(TARGET).dll \
     41        lib
    2642
    2743
    28 $(TARGET).dll: $(OBJS) $(TARGET).def
    29     $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    30           pmwsock.lib $(PDWIN32_LIB)\kernel32.lib \
    31           $(PDWIN32_LIB)\user32.lib  \
    32           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33     $(CP) $@ $(PDWIN32_BIN)
     44# Lib rule - build importlibrary (and evt. other libs)
     45lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    3446
    3547
    36 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    37 
    38 $(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
    39     $(CP) $** $@
    40 
    41 $(TARGET).lib: $(TARGET)exp.def
    42     $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    43     $(CP) $@ $(PDWIN32_LIB)
    44 
    45 $(TARGET)exp.def: $(TARGET).def
    46     $(IMPDEF) $** $@
     48# Dll rule - builds the target dll.
     49$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
     50    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    4751
    4852
    49 resource.asm: $(TARGET).rc
    50     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
     53# Linker file - creates the parameter file passed on to the linker.
     54$(OBJDIR)\$(TARGET).lrf: makefile
     55    @echo Creating file <<$@
     56/OUT:$(OBJDIR)\$(TARGET).dll
     57/MAP:$(OBJDIR)\$(TARGET).map
     58$(OBJS)
     59$(TARGET).def
     60pmwsock.lib
     61$(PDWIN32_LIB)\kernel32.lib
     62$(PDWIN32_LIB)/user32.lib
     63$(PDWIN32_LIB)/odincrt.lib
     64OS2386.LIB
     65$(RTLLIB_O)
     66<<keep
    5167
    5268
     69# Dep rule - makes depenencies for C, C++ and Asm files.
    5370dep:
    5471    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    5572        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    5673
    57 !ifndef NODEP
    58 !include .depend
    59 !endif
    6074
     75# Includes the common rules.
     76!include $(PDWIN32_INCLUDE)/pdwin32.post
    6177
    62 clean:
    63     $(RM) *.obj *.lib *.dll *~ *.map *.pch \
    64         $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
    65         resource.asm $(TARGET)exp.def
    66 
Note: See TracChangeset for help on using the changeset viewer.