Changeset 4717 for trunk/src


Ignore:
Timestamp:
Dec 3, 2000, 12:45:13 AM (25 years ago)
Author:
bird
Message:

New makefile style. (addjustments)

Location:
trunk/src
Files:
1 deleted
43 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/DPlayX/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.12 2000-11-19 09:18:20 bird Exp $
     1# $Id: makefile,v 1.13 2000-12-02 23:39:19 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    3434#
    3535LIBS = \
    36 $(PDWIN32_LIB)/kernel32.lib \
    37 $(PDWIN32_LIB)/$(ODINCRT).lib \
    38 $(PDWIN32_LIB)/advapi32.lib \
     36$(ODIN32_LIB)/kernel32.lib \
     37$(ODIN32_LIB)/$(ODINCRT).lib \
     38$(ODIN32_LIB)/advapi32.lib \
    3939OS2386.LIB \
    4040$(RTLLIB_O) \
    41 $(PDWIN32_LIB)/user32.lib \
    42 $(PDWIN32_LIB)/ole32.lib \
    43 $(PDWIN32_LIB)/winmm.lib \
    44 $(PDWIN32_LIB)/ntdll.lib \
    45 $(PDWIN32_LIB)/msvfw32.lib
     41$(ODIN32_LIB)/user32.lib \
     42$(ODIN32_LIB)/ole32.lib \
     43$(ODIN32_LIB)/winmm.lib \
     44$(ODIN32_LIB)/ntdll.lib \
     45$(ODIN32_LIB)/msvfw32.lib
    4646
    4747
     
    5555# Includes the common rules.
    5656#
    57 !include $(PDWIN32_INCLUDE)/pdwin32.post
     57!include $(ODIN32_POST_INC)
    5858
  • trunk/src/NTDLL/makefile

    r4630 r4717  
    1 # $Id: makefile,v 1.25 2000-11-19 12:56:37 sandervl Exp $
     1# $Id: makefile,v 1.26 2000-12-02 23:40:28 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    4040#
    4141LIBS = \
    42 $(PDWIN32_LIB)/kernel32.lib \
    43 $(PDWIN32_LIB)/user32.lib \
    44 $(PDWIN32_LIB)/crtdll.lib \
    45 $(PDWIN32_LIB)/$(ODINCRT).lib \
     42$(ODIN32_LIB)/kernel32.lib \
     43$(ODIN32_LIB)/user32.lib \
     44$(ODIN32_LIB)/crtdll.lib \
     45$(ODIN32_LIB)/$(ODINCRT).lib \
    4646OS2386.LIB \
    4747$(RTLLIB_O)
     
    5757# Includes the common rules.
    5858#
    59 !include $(PDWIN32_INCLUDE)/pdwin32.post
     59!include $(ODIN32_POST_INC)
    6060
  • trunk/src/advapi32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.26 2000-11-19 09:27:40 bird Exp $
     1# $Id: makefile,v 1.27 2000-12-02 23:36:27 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    3232#
    3333LIBS = \
    34 $(PDWIN32_LIB)/kernel32.lib \
    35 $(PDWIN32_LIB)/ntdll.lib \
    36 $(PDWIN32_LIB)/$(ODINCRT).lib \
    37 $(PDWIN32_LIB)/pmwinx.lib \
     34$(ODIN32_LIB)/kernel32.lib \
     35$(ODIN32_LIB)/ntdll.lib \
     36$(ODIN32_LIB)/$(ODINCRT).lib \
     37$(ODIN32_LIB)/pmwinx.lib \
    3838OS2386.LIB \
    3939$(RTLLIB_O)
     
    4949# Includes the common rules.
    5050#
    51 !include $(PDWIN32_INCLUDE)/pdwin32.post
     51!include $(ODIN32_POST_INC)
    5252
  • trunk/src/avifil32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.10 2000-11-19 09:26:55 bird Exp $
     1# $Id: makefile,v 1.11 2000-12-02 23:36:33 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2727#
    2828LIBS = \
    29 $(PDWIN32_LIB)/kernel32.lib \
    30 $(PDWIN32_LIB)/$(ODINCRT).lib \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/$(ODINCRT).lib \
    3131OS2386.LIB \
    3232$(RTLLIB_O) \
    33 $(PDWIN32_LIB)/ole32.lib \
    34 $(PDWIN32_LIB)/msvfw32.lib
     33$(ODIN32_LIB)/ole32.lib \
     34$(ODIN32_LIB)/msvfw32.lib
    3535
    3636
     
    4444# Includes the common rules.
    4545#
    46 !include $(PDWIN32_INCLUDE)/pdwin32.post
     46!include $(ODIN32_POST_INC)
    4747
  • trunk/src/capi2032/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.14 2000-11-19 09:23:29 bird Exp $
     1# $Id: makefile,v 1.15 2000-12-02 23:37:05 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2727#
    2828LIBS = \
    29 $(PDWIN32_LIB)/kernel32.lib \
    30 $(PDWIN32_LIB)/$(ODINCRT).lib \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/$(ODINCRT).lib \
    3131OS2386.LIB \
    3232$(RTLLIB_O)
     
    4242# Includes the common rules.
    4343#
    44 !include $(PDWIN32_INCLUDE)/pdwin32.post
     44!include $(ODIN32_POST_INC)
    4545
  • trunk/src/comctl32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.30 2000-11-19 09:25:46 bird Exp $
     1# $Id: makefile,v 1.31 2000-12-02 23:37:13 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    5353#
    5454LIBS = \
    55 $(PDWIN32_LIB)/kernel32.lib \
    56 $(PDWIN32_LIB)/gdi32.lib \
    57 $(PDWIN32_LIB)/user32.lib \
    58 $(PDWIN32_LIB)/msvfw32.lib \
    59 $(PDWIN32_LIB)/$(ODINCRT).lib \
     55$(ODIN32_LIB)/kernel32.lib \
     56$(ODIN32_LIB)/gdi32.lib \
     57$(ODIN32_LIB)/user32.lib \
     58$(ODIN32_LIB)/msvfw32.lib \
     59$(ODIN32_LIB)/$(ODINCRT).lib \
    6060os2386.lib \
    6161$(RTLLIB_O)
     
    7171# Includes the common rules.
    7272#
    73 !include $(PDWIN32_INCLUDE)/pdwin32.post
     73!include $(ODIN32_POST_INC)
    7474
  • trunk/src/comdlg32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.21 2000-11-19 09:23:00 bird Exp $
     1# $Id: makefile,v 1.22 2000-12-02 23:37:20 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    3535#
    3636LIBS = \
    37 $(PDWIN32_LIB)/kernel32.lib \
    38 $(PDWIN32_LIB)/user32.lib \
    39 $(PDWIN32_LIB)/$(ODINCRT).lib \
    40 $(PDWIN32_LIB)/shlwapi.lib \
    41 $(PDWIN32_LIB)/shell32.lib \
    42 $(PDWIN32_LIB)/comctl32.lib \
    43 $(PDWIN32_LIB)/gdi32.lib \
    44 $(PDWIN32_LIB)/pmwinx.lib \
     37$(ODIN32_LIB)/kernel32.lib \
     38$(ODIN32_LIB)/user32.lib \
     39$(ODIN32_LIB)/$(ODINCRT).lib \
     40$(ODIN32_LIB)/shlwapi.lib \
     41$(ODIN32_LIB)/shell32.lib \
     42$(ODIN32_LIB)/comctl32.lib \
     43$(ODIN32_LIB)/gdi32.lib \
     44$(ODIN32_LIB)/pmwinx.lib \
    4545os2386.lib \
    4646$(RTLLIB_O)
     
    5656# Includes the common rules.
    5757#
    58 !include $(PDWIN32_INCLUDE)/pdwin32.post
     58!include $(ODIN32_POST_INC)
    5959
  • trunk/src/crtdll/old/makefile

    r4667 r4717  
    1 # $Id: makefile,v 1.1 2000-11-21 23:49:04 phaller Exp $
     1# $Id: makefile,v 1.2 2000-12-02 23:37:31 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../../makefile.inc
    1414
    1515
     
    3434#
    3535LIBS = \
    36 $(PDWIN32_LIB)/kernel32.lib \
    37 $(PDWIN32_LIB)/$(ODINCRT).lib \
    38 $(PDWIN32_LIB)/user32.lib \
    39 $(PDWIN32_LIB)/pmwinx.lib \
     36$(ODIN32_LIB)/kernel32.lib \
     37$(ODIN32_LIB)/$(ODINCRT).lib \
     38$(ODIN32_LIB)/user32.lib \
     39$(ODIN32_LIB)/pmwinx.lib \
    4040os2386.lib \
    4141$(RTLLIB_O)
     
    5151# Includes the common rules.
    5252#
    53 !include $(PDWIN32_INCLUDE)/pdwin32.post
     53!include $(ODIN32_POST_INC)
    5454
  • trunk/src/dciman32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.2 2000-11-19 09:21:41 bird Exp $
     1# $Id: makefile,v 1.3 2000-12-02 23:38:47 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2727#
    2828LIBS = \
    29 $(PDWIN32_LIB)/kernel32.lib \
    30 $(PDWIN32_LIB)/gdi32.lib \
    31 $(PDWIN32_LIB)/$(ODINCRT).lib \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/gdi32.lib \
     31$(ODIN32_LIB)/$(ODINCRT).lib \
    3232os2386.lib \
    3333$(RTLLIB_O)
     
    4343# Includes the common rules.
    4444#
    45 !include $(PDWIN32_INCLUDE)/pdwin32.post
     45!include $(ODIN32_POST_INC)
    4646
  • trunk/src/ddraw/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.25 2000-11-19 09:20:50 bird Exp $
     1# $Id: makefile,v 1.26 2000-12-02 23:38:54 bird Exp $
     2
    23#
    3 # ddraw.dll makefile
     4# Odin32 API
    45#
    5 # Copyright 1998 Sander van Leeuwen
    6 #           1999 Markus Montkowski
     6#       ddraw.dll makefile
    77#
    8 # Project Odin Software License can be found in LICENSE.TXT
    9 #
    10 #
    11 
    128
    139
     
    1511# Compiler, tools, and interference rules.
    1612#
    17 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1814
    1915
     
    4440#
    4541LIBS = \
    46 $(PDWIN32_LIB)/ole32.lib \
    47 $(PDWIN32_LIB)/advapi32.lib \
    48 $(PDWIN32_LIB)/gdi32.lib \
    49 $(PDWIN32_LIB)/comctl32.lib \
    50 $(PDWIN32_LIB)/kernel32.lib \
    51 $(PDWIN32_LIB)/$(ODINCRT).lib \
    52 $(PDWIN32_LIB)/user32.lib \
     42$(ODIN32_LIB)/ole32.lib \
     43$(ODIN32_LIB)/advapi32.lib \
     44$(ODIN32_LIB)/gdi32.lib \
     45$(ODIN32_LIB)/comctl32.lib \
     46$(ODIN32_LIB)/kernel32.lib \
     47$(ODIN32_LIB)/$(ODINCRT).lib \
     48$(ODIN32_LIB)/user32.lib \
    5349mmpm2.lib \
    5450os2386.lib \
     
    6561# Includes the common rules.
    6662#
    67 !include $(PDWIN32_INCLUDE)/pdwin32.post
     63!include $(ODIN32_POST_INC)
    6864
  • trunk/src/ddraw/new/makefile

    r3345 r4717  
    1 # $Id: makefile,v 1.1 2000-04-07 18:21:13 mike Exp $
     1# $Id: makefile,v 1.2 2000-12-02 23:38:54 bird Exp $
     2
    23#
    3 # ddraw.dll makefile
     4# Odin32 API
    45#
    5 # Copyright 1998 Sander van Leeuwen
    6 #           1999 Markus Montkowski
    7 #
    8 # Project Odin Software License can be found in LICENSE.TXT
    9 #
     6#       ddraw.dll makefile
    107#
    118
    12 # Directory macros.
    13 PDWIN32_INCLUDE = ..\..\..\include
    14 PDWIN32_LIB     = ..\..\..\lib
    15 PDWIN32_BIN     = ..\..\..\$(OBJDIR)
    16 PDWIN32_TOOLS   = ..\..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../../makefile.inc
    1714
    1815
    19 # Compiler, tools, and interference rules.
    20 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    21 
    22 
    23 # Flag overloads and local macros.
    24 CLEANEXTRAS = ddrawrsrc.asm
    25 ASFLAGS     = -Sc -Sv:ALP
    26 
    27 
    28 # Object files. All objects should be prefixed with $(OBJDIR)!
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
    2919OBJS = \
    3020$(OBJDIR)\ddraw.obj \
     
    4737
    4838
     39#
     40# Libraries. One space before the '\'.
     41#
     42LIBS = \
     43$(ODIN32_LIB)/ole32.lib \
     44$(ODIN32_LIB)/advapi32.lib \
     45$(ODIN32_LIB)/gdi32.lib \
     46$(ODIN32_LIB)/comctl32.lib \
     47$(ODIN32_LIB)/kernel32.lib \
     48$(ODIN32_LIB)/$(ODINCRT).lib \
     49$(ODIN32_LIB)/user32.lib \
     50mmpm2.lib \
     51OS2386.LIB \
     52$(RTLLIB_O)
     53
     54
     55#
    4956# Target name - name of the dll without extention and path.
     57#
    5058TARGET = ddraw
    5159
    5260
    53 # All rule - build objs, target dll, copies dll to bin and makes libs.
    54 all:    $(OBJDIR) \
    55         $(OBJDIR)\$(TARGET).dll \
    56         $(PDWIN32_BIN)\$(TARGET).dll \
    57         lib
     61#
     62# Includes the common rules.
     63#
     64!include $(ODIN32_POST_INC)
    5865
    59 
    60 # Lib rule - build importlibrary (and evt. other libs)
    61 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
    62 
    63 
    64 # Dll rule - builds the target dll.
    65 $(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
    66     $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    67 
    68 
    69 # Linker file - creates the parameter file passed on to the linker.
    70 $(OBJDIR)\$(TARGET).lrf: makefile
    71     @echo Creating file <<$@
    72 /OUT:$(OBJDIR)\$(TARGET).dll
    73 /MAP:$(OBJDIR)\$(TARGET).map
    74 $(OBJS)
    75 $(PDWIN32_LIB)/ole32.lib
    76 $(PDWIN32_LIB)/advapi32.lib
    77 $(PDWIN32_LIB)/gdi32.lib
    78 $(PDWIN32_LIB)/comctl32.lib
    79 $(PDWIN32_LIB)/kernel32.lib
    80 $(PDWIN32_LIB)/odincrt.lib
    81 $(PDWIN32_LIB)/user32.lib
    82 mmpm2.lib
    83 OS2386.LIB
    84 $(RTLLIB_O)
    85 $(TARGET).def
    86 <<keep
    87 
    88 
    89 # Dep rule - makes depenencies for C, C++ and Asm files.
    90 dep:
    91     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    92         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
    93 
    94 
    95 # Includes the common rules.
    96 !include $(PDWIN32_INCLUDE)/pdwin32.post
    97 
  • trunk/src/dinput/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.8 2000-11-19 09:20:11 bird Exp $
     1# $Id: makefile,v 1.9 2000-12-02 23:39:00 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2929#
    3030LIBS = \
    31 $(PDWIN32_LIB)/kernel32.lib \
    32 $(PDWIN32_LIB)/$(ODINCRT).lib \
     31$(ODIN32_LIB)/kernel32.lib \
     32$(ODIN32_LIB)/$(ODINCRT).lib \
    3333OS2386.LIB \
    3434$(RTLLIB_O) \
    35 $(PDWIN32_LIB)/user32.lib \
    36 $(PDWIN32_LIB)/ole32.lib
     35$(ODIN32_LIB)/user32.lib \
     36$(ODIN32_LIB)/ole32.lib
    3737
    3838
     
    4646# Includes the common rules.
    4747#
    48 !include $(PDWIN32_INCLUDE)/pdwin32.post
     48!include $(ODIN32_POST_INC)
    4949
  • trunk/src/dllentry/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.6 2000-11-19 09:19:09 bird Exp $
     1# $Id: makefile,v 1.7 2000-12-02 23:39:06 bird Exp $
    22
    33#
     
    1818# Compiler, tools, and interference rules.
    1919#
    20 !include ../../include/pdwin32.mk
     20!include ../../makefile.inc
    2121
    2222
     
    4242# All rule - build objs and copies obj to lib.
    4343#
    44 all: $(OBJDIR) $(PDWIN32_LIB)\$(TARGET).obj
     44all: $(OBJDIR) $(ODIN32_LIB)\$(TARGET).obj
    4545
    4646
     
    5252
    5353# Build objs and copies obj to lib.
    54 $(PDWIN32_LIB)\$(TARGET).obj: $(OBJS)
     54$(ODIN32_LIB)\$(TARGET).obj: $(OBJS)
    5555    $(CP) $(OBJS) $@
    5656
     
    5959# Includes the common rules.
    6060#
    61 !include $(PDWIN32_INCLUDE)/pdwin32.post
     61!include $(ODIN32_POST_INC)
    6262
  • trunk/src/dplay/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.9 2000-11-19 09:17:41 bird Exp $
     1# $Id: makefile,v 1.10 2000-12-02 23:39:13 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2727#
    2828LIBS = \
    29 $(PDWIN32_LIB)/kernel32.lib \
    30 $(PDWIN32_LIB)/$(ODINCRT).lib \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/$(ODINCRT).lib \
    3131OS2386.LIB \
    3232$(RTLLIB_O) \
    33 $(PDWIN32_LIB)/ole32.lib \
    34 $(PDWIN32_LIB)/advapi32.lib
     33$(ODIN32_LIB)/ole32.lib \
     34$(ODIN32_LIB)/advapi32.lib
    3535
    3636
     
    4444# Includes the common rules.
    4545#
    46 !include $(PDWIN32_INCLUDE)/pdwin32.post
     46!include $(ODIN32_POST_INC)
    4747
  • trunk/src/dsound/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.20 2000-11-19 09:16:55 bird Exp $
     1# $Id: makefile,v 1.21 2000-12-02 23:39:26 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    3535#
    3636LIBS = \
    37 $(PDWIN32_LIB)/kernel32.lib \
    38 $(PDWIN32_LIB)/$(ODINCRT).lib \
    39 $(PDWIN32_LIB)/ole32.lib \
     37$(ODIN32_LIB)/kernel32.lib \
     38$(ODIN32_LIB)/$(ODINCRT).lib \
     39$(ODIN32_LIB)/ole32.lib \
    4040pmwinx.lib \
    4141mmpm2.lib \
     
    5353# Includes the common rules.
    5454#
    55 !include $(PDWIN32_INCLUDE)/pdwin32.post
     55!include $(ODIN32_POST_INC)
    5656
  • trunk/src/gdi32/makefile

    r4625 r4717  
    1 # $Id: makefile,v 1.31 2000-11-19 09:34:39 bird Exp $
     1# $Id: makefile,v 1.32 2000-12-02 23:39:32 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    5151#
    5252LIBS = \
    53 $(PDWIN32_LIB)/kernel32.lib \
    54 $(PDWIN32_LIB)/user32.lib \
    55 $(PDWIN32_LIB)/$(ODINCRT).lib \
    56 $(PDWIN32_LIB)/pmwinx.lib \
     53$(ODIN32_LIB)/kernel32.lib \
     54$(ODIN32_LIB)/user32.lib \
     55$(ODIN32_LIB)/$(ODINCRT).lib \
     56$(ODIN32_LIB)/pmwinx.lib \
    5757OS2386.LIB \
    5858$(RTLLIB_O)
     
    6868# Includes the common rules.
    6969#
    70 !include $(PDWIN32_INCLUDE)/pdwin32.post
     70!include $(ODIN32_POST_INC)
    7171
  • trunk/src/icmp/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.5 2000-11-19 09:15:25 bird Exp $
     1# $Id: makefile,v 1.6 2000-12-02 23:39:37 bird Exp $
     2
    23#
    34# icmp.dll makefile
    45#
    5 # Project Odin Software License can be found in LICENSE.TXT
    6 #
     6#       Project Odin Software License can be found in LICENSE.TXT
    77#
    88
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2828LIBS = \
    2929os2386.lib \
    30 $(PDWIN32_LIB)/wsock32.lib \
     30$(ODIN32_LIB)/wsock32.lib \
    3131$(RTLLIB_O) \
    32 $(PDWIN32_LIB)/$(ODINCRT).lib \
    33 $(PDWIN32_LIB)/kernel32.lib
     32$(ODIN32_LIB)/$(ODINCRT).lib \
     33$(ODIN32_LIB)/kernel32.lib
    3434
    3535
     
    4343# Includes the common rules.
    4444#
    45 !include $(PDWIN32_INCLUDE)/pdwin32.post
     45!include $(ODIN32_POST_INC)
    4646
  • trunk/src/imagehlp/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.12 2000-11-19 09:15:10 bird Exp $
     1# $Id: makefile,v 1.13 2000-12-02 23:39:44 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    3333#
    3434LIBS = \
    35 $(PDWIN32_LIB)/kernel32.lib \
    36 $(PDWIN32_LIB)/$(ODINCRT).lib \
     35$(ODIN32_LIB)/kernel32.lib \
     36$(ODIN32_LIB)/$(ODINCRT).lib \
    3737OS2386.LIB \
    3838$(RTLLIB_O)
     
    4848# Includes the common rules.
    4949#
    50 !include $(PDWIN32_INCLUDE)/pdwin32.post
     50!include $(ODIN32_POST_INC)
    5151
  • trunk/src/imm32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.11 2000-11-19 09:14:43 bird Exp $
     1# $Id: makefile,v 1.12 2000-12-02 23:39:51 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2727#
    2828LIBS = \
    29 $(PDWIN32_LIB)/kernel32.lib \
    30 $(PDWIN32_LIB)/$(ODINCRT).lib \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/$(ODINCRT).lib \
    3131OS2386.LIB \
    3232$(RTLLIB_O)
     
    4242# Includes the common rules.
    4343#
    44 !include $(PDWIN32_INCLUDE)/pdwin32.post
     44!include $(ODIN32_POST_INC)
    4545
  • trunk/src/lz32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.13 2000-11-19 09:13:58 bird Exp $
     1# $Id: makefile,v 1.14 2000-12-02 23:39:57 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2727#
    2828LIBS = \
    29 $(PDWIN32_LIB)/$(ODINCRT).lib \
    30 $(PDWIN32_LIB)/kernel32.lib \
     29$(ODIN32_LIB)/$(ODINCRT).lib \
     30$(ODIN32_LIB)/kernel32.lib \
    3131os2386.lib \
    3232$(RTLLIB_O)
     
    4242# Includes the common rules.
    4343#
    44 !include $(PDWIN32_INCLUDE)/pdwin32.post
     44!include $(ODIN32_POST_INC)
    4545
  • trunk/src/mpr/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.16 2000-11-19 09:13:33 bird Exp $
     1# $Id: makefile,v 1.17 2000-12-02 23:40:03 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2727#
    2828LIBS = \
    29 $(PDWIN32_LIB)/kernel32.lib \
    30 $(PDWIN32_LIB)/user32.lib \
    31 $(PDWIN32_LIB)/$(ODINCRT).lib \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/user32.lib \
     31$(ODIN32_LIB)/$(ODINCRT).lib \
    3232OS2386.LIB \
    3333$(RTLLIB_O)
     
    4343# Includes the common rules.
    4444#
    45 !include $(PDWIN32_INCLUDE)/pdwin32.post
     45!include $(ODIN32_POST_INC)
    4646
  • trunk/src/msacm32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.12 2000-11-19 09:12:04 bird Exp $
     1# $Id: makefile,v 1.13 2000-12-02 23:40:09 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    3232#
    3333LIBS = \
    34 $(PDWIN32_LIB)/kernel32.lib \
    35 $(PDWIN32_LIB)/$(ODINCRT).lib \
    36 $(PDWIN32_LIB)/winmm.lib \
    37 $(PDWIN32_LIB)/advapi32.lib \
    38 $(PDWIN32_LIB)/pmwinx.lib \
     34$(ODIN32_LIB)/kernel32.lib \
     35$(ODIN32_LIB)/$(ODINCRT).lib \
     36$(ODIN32_LIB)/winmm.lib \
     37$(ODIN32_LIB)/advapi32.lib \
     38$(ODIN32_LIB)/pmwinx.lib \
    3939OS2386.LIB \
    4040$(RTLLIB_O)
     
    5050# Includes the common rules.
    5151#
    52 !include $(PDWIN32_INCLUDE)/pdwin32.post
     52!include $(ODIN32_POST_INC)
    5353
  • trunk/src/msvcrt/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.19 2000-11-19 09:09:12 bird Exp $
     1# $Id: makefile,v 1.20 2000-12-02 23:40:15 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
  • trunk/src/msvcrt/msvcrt.mak

    r4624 r4717  
    1 # $Id: msvcrt.mak,v 1.1 2000-11-19 09:09:12 bird Exp $
     1# $Id: msvcrt.mak,v 1.2 2000-12-02 23:40:15 bird Exp $
    22
    33#
     
    1717# Compiler, tools, and interference rules.
    1818#
    19 !include ../../include/pdwin32.mk
     19!include ../../makefile.inc
    2020
    2121
     
    3535#
    3636LIBS = \
    37 $(PDWIN32_LIB)/kernel32.lib \
    38 $(PDWIN32_LIB)/crtdll.lib \
    39 $(PDWIN32_LIB)/$(ODINCRT).lib \
     37$(ODIN32_LIB)/kernel32.lib \
     38$(ODIN32_LIB)/crtdll.lib \
     39$(ODIN32_LIB)/$(ODINCRT).lib \
    4040OS2386.LIB \
    4141$(RTLLIB_O)
     
    5151# Includes the common rules.
    5252#
    53 !include $(PDWIN32_INCLUDE)/pdwin32.post
     53!include $(ODIN32_POST_INC)
    5454
  • trunk/src/msvcrt/msvcrt20.mak

    r4624 r4717  
    1 # $Id: msvcrt20.mak,v 1.1 2000-11-19 09:09:12 bird Exp $
     1# $Id: msvcrt20.mak,v 1.2 2000-12-02 23:40:15 bird Exp $
    22
    33#
     
    1717# Compiler, tools, and interference rules.
    1818#
    19 !include ../../include/pdwin32.mk
     19!include ../../makefile.inc
    2020
    2121
     
    3535#
    3636LIBS = \
    37 $(PDWIN32_LIB)/kernel32.lib \
    38 $(PDWIN32_LIB)/crtdll.lib \
    39 $(PDWIN32_LIB)/$(ODINCRT).lib \
     37$(ODIN32_LIB)/kernel32.lib \
     38$(ODIN32_LIB)/crtdll.lib \
     39$(ODIN32_LIB)/$(ODINCRT).lib \
    4040OS2386.LIB \
    4141$(RTLLIB_O)
     
    5151# Includes the common rules.
    5252#
    53 !include $(PDWIN32_INCLUDE)/pdwin32.post
     53!include $(ODIN32_POST_INC)
    5454
  • trunk/src/msvcrt/msvcrt40.mak

    r4624 r4717  
    1 # $Id: msvcrt40.mak,v 1.1 2000-11-19 09:09:12 bird Exp $
     1# $Id: msvcrt40.mak,v 1.2 2000-12-02 23:40:15 bird Exp $
    22
    33#
     
    1717# Compiler, tools, and interference rules.
    1818#
    19 !include ../../include/pdwin32.mk
     19!include ../../makefile.inc
    2020
    2121
     
    3535#
    3636LIBS = \
    37 $(PDWIN32_LIB)/kernel32.lib \
    38 $(PDWIN32_LIB)/crtdll.lib \
    39 $(PDWIN32_LIB)/$(ODINCRT).lib \
     37$(ODIN32_LIB)/kernel32.lib \
     38$(ODIN32_LIB)/crtdll.lib \
     39$(ODIN32_LIB)/$(ODINCRT).lib \
    4040OS2386.LIB \
    4141$(RTLLIB_O)
     
    5151# Includes the common rules.
    5252#
    53 !include $(PDWIN32_INCLUDE)/pdwin32.post
     53!include $(ODIN32_POST_INC)
    5454
  • trunk/src/msvfw32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.10 2000-11-19 09:08:05 bird Exp $
     1# $Id: makefile,v 1.11 2000-12-02 23:40:22 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2727#
    2828LIBS = \
    29 $(PDWIN32_LIB)/kernel32.lib \
    30 $(PDWIN32_LIB)/user32.lib \
    31 $(PDWIN32_LIB)/gdi32.lib \
    32 $(PDWIN32_LIB)/winmm.lib \
    33 $(PDWIN32_LIB)/$(ODINCRT).lib \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/user32.lib \
     31$(ODIN32_LIB)/gdi32.lib \
     32$(ODIN32_LIB)/winmm.lib \
     33$(ODIN32_LIB)/$(ODINCRT).lib \
    3434OS2386.LIB \
    3535$(RTLLIB_O)
     
    4545# Includes the common rules.
    4646#
    47 !include $(PDWIN32_INCLUDE)/pdwin32.post
     47!include $(ODIN32_POST_INC)
    4848
  • trunk/src/odincrt/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.19 2000-11-19 09:06:58 bird Exp $
     1# $Id: makefile,v 1.20 2000-12-02 23:40:36 bird Exp $
    22
    33#
     
    66#       odincrt.dll makefile
    77#
     8
    89
    910#
     
    1617# Compiler, tools, and interference rules.
    1718#
    18 !include ../../include/pdwin32.mk
     19!include ../../makefile.inc
    1920
    2021
     
    6970# Includes the common rules.
    7071#
    71 !include $(PDWIN32_INCLUDE)/pdwin32.post
     72!include $(ODIN32_POST_INC)
    7273
  • trunk/src/ole32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.27 2000-11-19 09:05:15 bird Exp $
     1# $Id: makefile,v 1.28 2000-12-02 23:40:42 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
  • trunk/src/ole32/new/makefile

    r3456 r4717  
    1 # $Id: makefile,v 1.1 2000-04-27 22:21:36 davidr Exp $
     1# $Id: makefile,v 1.2 2000-12-02 23:40:43 bird Exp $
    22
    33#
     
    88
    99
    10 # Directory macros.
    11 PDWIN32_INCLUDE = ..\..\..\include
    12 PDWIN32_LIB     = ..\..\..\lib
    13 PDWIN32_BIN     = ..\..\..\$(OBJDIR)
    14 PDWIN32_TOOLS   = ..\..\..\tools\bin
    15 
    1610
    1711# Compiler, tools, and interference rules.
    18 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     12OLD_STYLE = 1
     13!include ../../../makefile.inc
    1914
    2015
    2116# Flag overloads and local macros.
    22 CLEANEXTRAS = ole32rsrc.asm $(PDWIN32_BIN)\regsvr32.exe
     17CLEANEXTRAS = ole32rsrc.asm $(ODIN32_BIN)\regsvr32.exe
    2318
    2419
     
    6863all:    $(OBJDIR) \
    6964        $(OBJDIR)\$(TARGET).dll \
    70         $(PDWIN32_BIN)\$(TARGET).dll \
     65        $(ODIN32_BIN)\$(TARGET).dll \
    7166        lib \
    7267        $(OBJDIR)\regsvr32.exe \
    73         $(PDWIN32_BIN)\regsvr32.exe
     68        $(ODIN32_BIN)\regsvr32.exe
    7469
    7570
    7671# Lib rule - build importlibrary (and evt. other libs)
    77 lib: $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
     72lib: $(ORGTARGET).lib $(ODIN32_LIB)\$(ORGTARGET).lib
    7873
    7974
     
    8984/MAP:$(OBJDIR)\$(TARGET).map
    9085$(OBJS)
    91 $(PDWIN32_LIB)/rpcrt4.lib
    92 $(PDWIN32_LIB)/user32.lib
    93 $(PDWIN32_LIB)/gdi32.lib
    94 $(PDWIN32_LIB)/comctl32.lib
    95 $(PDWIN32_LIB)/advapi32.lib
    96 $(PDWIN32_LIB)/kernel32.lib
    97 $(PDWIN32_LIB)/oleaut32.lib
    98 $(PDWIN32_LIB)/odincrt.lib
     86$(ODIN32_LIB)/rpcrt4.lib
     87$(ODIN32_LIB)/user32.lib
     88$(ODIN32_LIB)/gdi32.lib
     89$(ODIN32_LIB)/comctl32.lib
     90$(ODIN32_LIB)/advapi32.lib
     91$(ODIN32_LIB)/kernel32.lib
     92$(ODIN32_LIB)/oleaut32.lib
     93$(ODIN32_LIB)/odincrt.lib
    9994OS2386.LIB
    10095$(RTLLIB_O)
     
    111106
    112107$(OBJDIR)\regsvr32.exe:   $(OBJDIR)\regsvr32.obj regsvr32.def \
    113                 $(PDWIN32_LIB)/user32.lib \
    114                 $(PDWIN32_LIB)/kernel32.lib \
    115                 $(PDWIN32_LIB)/ole32.lib
     108                $(ODIN32_LIB)/user32.lib \
     109                $(ODIN32_LIB)/kernel32.lib \
     110                $(ODIN32_LIB)/ole32.lib
    116111    $(LD) $(LDFLAGS) -Ge+ -Fm -Fe$@ $** \
    117         $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
     112        $(ODIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    118113
    119 $(PDWIN32_BIN)\regsvr32.exe: $(OBJDIR)\regsvr32.exe
     114$(ODIN32_BIN)\regsvr32.exe: $(OBJDIR)\regsvr32.exe
    120115    $(CP) $** $@
    121116
     
    123118# Dep rule - makes depenencies for C, C++ and Asm files.
    124119dep:
    125     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win;. \
    126         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     120    $(DEPEND) -I$(ODIN32_INCLUDE);$(ODIN32_INCLUDE)\win;. \
     121        *.c *.cpp *.h *.asm *.inc $(ODIN32_INCLUDE)\*.h
    127122
    128123
    129124# Includes the common rules.
    130 !include $(PDWIN32_INCLUDE)/pdwin32.post
     125!include $(ODIN32_POST_INC)
    131126
  • trunk/src/ole32/ole32.mak

    r4659 r4717  
    1 # $Id: ole32.mak,v 1.2 2000-11-21 11:36:51 sandervl Exp $
     1# $Id: ole32.mak,v 1.3 2000-12-02 23:40:43 bird Exp $
    22
    33#
     
    1616# Compiler, tools, and interference rules.
    1717#
    18 !include ../../include/pdwin32.mk
     18!include ../../makefile.inc
    1919
    2020
     
    6161#
    6262LIBS = \
    63 $(PDWIN32_LIB)/rpcrt4.lib \
    64 $(PDWIN32_LIB)/user32.lib \
    65 $(PDWIN32_LIB)/gdi32.lib \
    66 $(PDWIN32_LIB)/comctl32.lib \
    67 $(PDWIN32_LIB)/advapi32.lib \
    68 $(PDWIN32_LIB)/kernel32.lib \
    69 $(PDWIN32_LIB)/oleaut32.lib \
    70 $(PDWIN32_LIB)/$(ODINCRT).lib \
     63$(ODIN32_LIB)/rpcrt4.lib \
     64$(ODIN32_LIB)/user32.lib \
     65$(ODIN32_LIB)/gdi32.lib \
     66$(ODIN32_LIB)/comctl32.lib \
     67$(ODIN32_LIB)/advapi32.lib \
     68$(ODIN32_LIB)/kernel32.lib \
     69$(ODIN32_LIB)/oleaut32.lib \
     70$(ODIN32_LIB)/$(ODINCRT).lib \
    7171OS2386.LIB \
    7272$(RTLLIB_O)
     
    8383# Includes the common rules.
    8484#
    85 !include $(PDWIN32_INCLUDE)/pdwin32.post
     85!include $(ODIN32_POST_INC)
    8686
  • trunk/src/ole32/regsvr32.mak

    r4624 r4717  
    1 # $Id: regsvr32.mak,v 1.1 2000-11-19 09:05:15 bird Exp $
     1# $Id: regsvr32.mak,v 1.2 2000-12-02 23:40:43 bird Exp $
    22
    33#
     
    1919# Compiler, tools, and interference rules.
    2020#
    21 !include ../../include/pdwin32.mk
     21!include ../../makefile.inc
    2222
    2323
     
    3333#
    3434LIBS = \
    35 $(PDWIN32_LIB)/user32.lib \
    36 $(PDWIN32_LIB)/kernel32.lib \
    37 $(PDWIN32_LIB)/ole32.lib \
    38 $(PDWIN32_LIB)/$(ODINCRT).lib \
     35$(ODIN32_LIB)/user32.lib \
     36$(ODIN32_LIB)/kernel32.lib \
     37$(ODIN32_LIB)/ole32.lib \
     38$(ODIN32_LIB)/$(ODINCRT).lib \
    3939OS2386.LIB \
    4040$(RTLLIB_O)
     
    5050# Includes the common rules.
    5151#
    52 !include $(PDWIN32_INCLUDE)/pdwin32.post
     52!include $(ODIN32_POST_INC)
    5353
  • trunk/src/oleaut32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.20 2000-11-19 09:04:02 bird Exp $
     1# $Id: makefile,v 1.21 2000-12-02 23:40:50 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    4646#
    4747LIBS = \
    48 $(PDWIN32_LIB)/advapi32.lib \
    49 $(PDWIN32_LIB)/kernel32.lib \
    50 $(PDWIN32_LIB)/user32.lib \
    51 $(PDWIN32_LIB)/ole32.lib \
    52 $(PDWIN32_LIB)/gdi32.lib \
    53 $(PDWIN32_LIB)/$(ODINCRT).lib \
    54 $(PDWIN32_LIB)/pmwinx.lib \
     48$(ODIN32_LIB)/advapi32.lib \
     49$(ODIN32_LIB)/kernel32.lib \
     50$(ODIN32_LIB)/user32.lib \
     51$(ODIN32_LIB)/ole32.lib \
     52$(ODIN32_LIB)/gdi32.lib \
     53$(ODIN32_LIB)/$(ODINCRT).lib \
     54$(ODIN32_LIB)/pmwinx.lib \
    5555OS2386.LIB \
    5656$(RTLLIB_O)
     
    6767# Includes the common rules.
    6868#
    69 !include $(PDWIN32_INCLUDE)/pdwin32.post
     69!include $(ODIN32_POST_INC)
    7070
  • trunk/src/olecli32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.11 2000-11-19 09:03:33 bird Exp $
     1# $Id: makefile,v 1.12 2000-12-02 23:40:57 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2727#
    2828LIBS = \
    29 $(PDWIN32_LIB)/kernel32.lib \
    30 $(PDWIN32_LIB)/$(ODINCRT).lib \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/$(ODINCRT).lib \
    3131OS2386.LIB \
    3232$(RTLLIB_O)
     
    4242# Includes the common rules.
    4343#
    44 !include $(PDWIN32_INCLUDE)/pdwin32.post
     44!include $(ODIN32_POST_INC)
    4545
  • trunk/src/oledlg/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.11 2000-11-19 09:03:01 bird Exp $
     1# $Id: makefile,v 1.12 2000-12-02 23:41:04 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2727#
    2828LIBS = \
    29 $(PDWIN32_LIB)/kernel32.lib \
    30 $(PDWIN32_LIB)/$(ODINCRT).lib \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/$(ODINCRT).lib \
    3131OS2386.LIB \
    3232$(RTLLIB_O)
     
    4242# Includes the common rules.
    4343#
    44 !include $(PDWIN32_INCLUDE)/pdwin32.post
     44!include $(ODIN32_POST_INC)
    4545
  • trunk/src/olepro32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.4 2000-11-19 09:01:18 bird Exp $
     1# $Id: makefile,v 1.5 2000-12-02 23:41:11 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2727#
    2828LIBS = \
    29 $(PDWIN32_LIB)/kernel32.lib \
    30 $(PDWIN32_LIB)/oleaut32.lib \
    31 $(PDWIN32_LIB)/$(ODINCRT).lib \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/oleaut32.lib \
     31$(ODIN32_LIB)/$(ODINCRT).lib \
    3232OS2386.LIB \
    3333$(RTLLIB_O)
     
    4343# Includes the common rules.
    4444#
    45 !include $(PDWIN32_INCLUDE)/pdwin32.post
     45!include $(ODIN32_POST_INC)
    4646
  • trunk/src/olesvr32/makefile

    r4624 r4717  
    1 # $Id: makefile,v 1.12 2000-11-19 09:00:28 bird Exp $
     1# $Id: makefile,v 1.13 2000-12-02 23:41:17 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2727#
    2828LIBS = \
    29 $(PDWIN32_LIB)/kernel32.lib \
    30 $(PDWIN32_LIB)/$(ODINCRT).lib \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/$(ODINCRT).lib \
    3131OS2386.LIB \
    3232$(RTLLIB_O)
     
    4242# Includes the common rules.
    4343#
    44 !include $(PDWIN32_INCLUDE)/pdwin32.post
     44!include $(ODIN32_POST_INC)
    4545
  • trunk/src/winspool/makefile

    r4620 r4717  
    1 # $Id: makefile,v 1.18 2000-11-19 08:35:50 bird Exp $
     1# $Id: makefile,v 1.19 2000-12-02 23:45:13 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2828#
    2929LIBS = \
    30 $(PDWIN32_LIB)/kernel32.lib \
    31 $(PDWIN32_LIB)/pmwinx.lib \
    32 $(PDWIN32_LIB)/user32.lib \
    33 $(PDWIN32_LIB)/$(ODINCRT).lib \
     30$(ODIN32_LIB)/kernel32.lib \
     31$(ODIN32_LIB)/pmwinx.lib \
     32$(ODIN32_LIB)/user32.lib \
     33$(ODIN32_LIB)/$(ODINCRT).lib \
    3434OS2386.LIB \
    3535$(RTLLIB_O)
     
    4545# Includes the common rules.
    4646#
    47 !include $(PDWIN32_INCLUDE)/pdwin32.post
     47!include $(ODIN32_POST_INC)
    4848
  • trunk/src/wnaspi32/makefile

    r4620 r4717  
    1 # $Id: makefile,v 1.12 2000-11-19 08:35:50 bird Exp $
     1# $Id: makefile,v 1.13 2000-12-02 23:45:07 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2828#
    2929LIBS = \
    30 $(PDWIN32_LIB)/kernel32.lib \
    31 $(PDWIN32_LIB)/$(ODINCRT).lib \
    32 $(PDWIN32_LIB)/advapi32.lib \
     30$(ODIN32_LIB)/kernel32.lib \
     31$(ODIN32_LIB)/$(ODINCRT).lib \
     32$(ODIN32_LIB)/advapi32.lib \
    3333OS2386.LIB \
    3434$(RTLLIB_O)
     
    4444# Includes the common rules.
    4545#
    46 !include $(PDWIN32_INCLUDE)/pdwin32.post
     46!include $(ODIN32_POST_INC)
    4747
  • trunk/src/wnetap32/makefile

    r4621 r4717  
    1 # $Id: makefile,v 1.15 2000-11-19 08:38:24 bird Exp $
     1# $Id: makefile,v 1.16 2000-12-02 23:44:57 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2828#
    2929LIBS = \
    30 $(PDWIN32_LIB)/kernel32.lib \
    31 $(PDWIN32_LIB)/user32.lib \
    32 $(PDWIN32_LIB)/$(ODINCRT).lib \
     30$(ODIN32_LIB)/kernel32.lib \
     31$(ODIN32_LIB)/user32.lib \
     32$(ODIN32_LIB)/$(ODINCRT).lib \
    3333OS2386.LIB \
    3434$(RTLLIB_O)
     
    4545# Includes the common rules.
    4646#
    47 !include $(PDWIN32_INCLUDE)/pdwin32.post
     47!include $(ODIN32_POST_INC)
    4848
  • trunk/src/wsock32/makefile

    r4620 r4717  
    1 # $Id: makefile,v 1.28 2000-11-19 08:35:49 bird Exp $
     1# $Id: makefile,v 1.29 2000-12-02 23:43:27 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    3939#
    4040LIBS = \
    41 $(PDWIN32_LIB)/kernel32.lib \
    42 $(PDWIN32_LIB)/user32.lib \
    43 $(PDWIN32_LIB)/$(ODINCRT).lib \
     41$(ODIN32_LIB)/kernel32.lib \
     42$(ODIN32_LIB)/user32.lib \
     43$(ODIN32_LIB)/$(ODINCRT).lib \
    4444so32dll.lib \
    4545tcp32dll.lib \
     
    5757# Includes the common rules.
    5858#
    59 !include $(PDWIN32_INCLUDE)/pdwin32.post
     59!include $(ODIN32_POST_INC)
    6060
  • trunk/src/wsock32/new/makefile

    r3198 r4717  
    1 # $Id: makefile,v 1.9 2000-03-22 20:01:06 sandervl Exp $
     1# $Id: makefile,v 1.10 2000-12-02 23:43:27 bird Exp $
    22
    33#
     
    77#
    88
    9 # Directory macros.
    10 PDWIN32_INCLUDE = ..\..\..\include
    11 PDWIN32_LIB     = ..\..\..\lib
    12 PDWIN32_BIN     = ..\..\..\$(OBJDIR)
    13 PDWIN32_TOOLS   = ..\..\..\tools\bin
    14 
    159
    1610# Compiler, tools, and interference rules.
    17 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     11OLD_STYLE=1
     12!include ../../../makefile.inc
    1813
    1914
     
    4439all:    $(OBJDIR) \
    4540        $(OBJDIR)\$(TARGET).dll \
    46         $(PDWIN32_BIN)\$(TARGET).dll \
     41        $(ODIN32_BIN)\$(TARGET).dll \
    4742        lib
    4843
    4944
    5045# Lib rule - build importlibrary (and evt. other libs)
    51 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
     46lib: $(TARGET).lib $(ODIN32_LIB)\$(TARGET).lib
    5247
    5348
     
    6560$(TARGET).def
    6661tcp32dll.lib so32dll.lib
    67 $(PDWIN32_LIB)\kernel32.lib
    68 $(PDWIN32_LIB)/user32.lib
    69 $(PDWIN32_LIB)/odincrt.lib
     62$(ODIN32_LIB)\kernel32.lib
     63$(ODIN32_LIB)/user32.lib
     64$(ODIN32_LIB)/odincrt.lib
    7065OS2386.LIB
    7166$(RTLLIB_O)
     
    7570# Dep rule - makes depenencies for C, C++ and Asm files.
    7671dep:
    77     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
    78         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     72    $(DEPEND) -I$(ODIN32_INCLUDE);$(ODIN32_INCLUDE)\win \
     73        *.c *.cpp *.h *.asm *.inc $(ODIN32_INCLUDE)\*.h
    7974
    8075
    8176# Includes the common rules.
    82 !include $(PDWIN32_INCLUDE)/pdwin32.post
     77!include $(ODIN32_POST_INC)
    8378
  • trunk/src/wsock32/old/makefile

    r2014 r4717  
    1 # $Id: makefile,v 1.2 1999-12-07 20:29:15 achimha Exp $
     1# $Id: makefile,v 1.3 2000-12-02 23:43:28 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 #       wsock32.dll makefile
     6#       wsock32.dll makefile
    77#
    88
    9 PDWIN32_INCLUDE = ..\..\..\include
    10 PDWIN32_LIB = ..\..\..\lib
    11 PDWIN32_BIN = ..\..\..\bin
    12 PDWIN32_TOOLS = ..\..\..\tools\bin
    13 
    14 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     9OLD_STYLE=1
     10!include ../../../makefile.inc
    1511
    1612
    17 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    18 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     13CFLAGS = $(CFLAGS) -I$(ODIN32_INCLUDE)
     14CXXFLAGS = $(CXXFLAGS) -I$(ODIN32_INCLUDE)
    1915
    2016
     
    2723
    2824$(TARGET).dll: $(OBJS) $(TARGET).def
    29         $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    30               $(PDWIN32_LIB)\pmwinx.lib $(PDWIN32_LIB)\user32.lib \
    31               tcp32dll.lib so32dll.lib  $(PDWIN32_LIB)\kernel32.lib \
    32               $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33         $(CP) $@ $(PDWIN32_BIN)
     25    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
     26              $(ODIN32_LIB)\pmwinx.lib $(ODIN32_LIB)\user32.lib \
     27              tcp32dll.lib so32dll.lib  $(ODIN32_LIB)\kernel32.lib \
     28              $(ODIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
     29    $(CP) $@ $(ODIN32_BIN)
    3430
    3531$(TARGET).lib: $(TARGET)exp.def
    3632    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    37     $(CP) $@ $(PDWIN32_LIB)
     33    $(CP) $@ $(ODIN32_LIB)
    3834
    3935$(TARGET)exp.def: $(TARGET).def
     
    4743
    4844clean:
    49         $(RM) *.obj *.lib *.dll *~ *.map *.pch
    50         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
    51         $(RM) $(PDWIN32_LIB)\$(TARGET).lib
     45    $(RM) *.obj *.lib *.dll *~ *.map *.pch
     46    $(RM) $(ODIN32_BIN)\$(TARGET).dll
     47    $(RM) $(ODIN32_LIB)\$(TARGET).lib
    5248
Note: See TracChangeset for help on using the changeset viewer.