Changeset 4719 for trunk/src


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

New makefile style. (addjustments)

Location:
trunk/src
Files:
5 added
5 deleted
35 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/opengl/glu/nurbs/interface/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.7 2000-11-19 08:58:13 bird Exp $
     1# $Id: makefile,v 1.8 2000-12-02 23:59:44 bird Exp $
     2
    23#
    3 # PD-Win32 API
     4# Odin32 API
    45#
    56#       glu/nurbs/interface makefile
    67#
    7 
    8 
    9 #
    10 # Directory macros.
    11 #
    12 PDWIN32_INCLUDE = ..\..\..\..\..\include
    13 PDWIN32_LIB     = ..\..\..\..\..\lib
    14 PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
    15 PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
    168
    179
     
    2618# Compiler, tools, and interference rules.
    2719#
    28 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     20!include ../../../../../makefile.inc
    2921
    3022
     
    6153# Includes the common rules.
    6254#
    63 !include $(PDWIN32_INCLUDE)/pdwin32.post
     55!include $(ODIN32_POST_INC)
    6456
    6557
  • trunk/src/opengl/glu/nurbs/internals/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.6 2000-11-19 08:58:14 bird Exp $
     1# $Id: makefile,v 1.7 2000-12-02 23:59:51 bird Exp $
    22
    33#
     
    66#       glu/nurbs/internals makefile
    77#
    8 
    9 
    10 #
    11 # Directory macros.
    12 #
    13 PDWIN32_INCLUDE = ..\..\..\..\..\include
    14 PDWIN32_LIB     = ..\..\..\..\..\lib
    15 PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
    16 PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
    178
    189
     
    2718# Compiler, tools, and interference rules.
    2819#
    29 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     20!include ../../../../../makefile.inc
    3021
    3122
     
    3526CINCLUDES   = $(CINCLUDES) -I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I..\..\include
    3627CDEFINES    = $(CDEFINES)  -DSTANDALONE -DLIBRARYBUILD -DNDEBUG
     28!if "$(VAC3)" == "1" || "$(VAC36)" == "1"
    3729CFLAGS      = $(CFLAGS) -O-
     30!endif
    3831
    3932
     
    9891# Includes the common rules.
    9992#
    100 !include $(PDWIN32_INCLUDE)/pdwin32.post
     93!include $(ODIN32_POST_INC)
    10194
    10295
  • trunk/src/opengl/glu/tess/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.5 2000-11-19 08:58:14 bird Exp $
     1# $Id: makefile,v 1.6 2000-12-02 23:59:13 bird Exp $
    22
    33#
     
    66#       glu/tess makefile
    77#
    8 
    9 #
    10 # Directory macros.
    11 #
    12 PDWIN32_INCLUDE = ..\..\..\..\include
    13 PDWIN32_LIB     = ..\..\..\..\lib
    14 PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
    15 PDWIN32_TOOLS   = ..\..\..\..\tools\bin
    168
    179
     
    2618# Compiler, tools, and interference rules.
    2719#
    28 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     20!include ../../../../makefile.inc
    2921
    3022
     
    3426CINCLUDES   = $(CINCLUDES) -I.. -I..\..\mesa -I..\include -I..\..\mesa\GL
    3527CDEFINES    = $(CDEFINES) -DNDEBUG
     28!if "$(VAC3)" == "1" || "$(VAC36)" == "1"
    3629CFLAGS      = $(CFLAGS) -Tdp
    3730CXXFLAGS    = $(CXXFLAGS) -Tdp
     31!else
     32!error "Compiler is not yet supported."
     33!endif
    3834
    3935
     
    6359# Includes the common rules.
    6460#
    65 !include $(PDWIN32_INCLUDE)/pdwin32.post
     61!include $(ODIN32_POST_INC)
    6662
    6763
  • trunk/src/opengl/glu/util/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.5 2000-11-19 08:58:15 bird Exp $
     1# $Id: makefile,v 1.6 2000-12-02 23:59:06 bird Exp $
    22
    33#
     
    66#       glu/util makefile
    77#
    8 
    9 
    10 #
    11 # Directory macros.
    12 #
    13 PDWIN32_INCLUDE = ..\..\..\..\include
    14 PDWIN32_LIB     = ..\..\..\..\lib
    15 PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
    16 PDWIN32_TOOLS   = ..\..\..\..\tools\bin
    178
    189
     
    2718# Compiler, tools, and interference rules.
    2819#
    29 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     20!include ../../../../makefile.inc
    3021
    3122
     
    3526CINCLUDES   = $(CINCLUDES) -I.. -I..\..\mesa -I..\include -I..\..\mesa\GL
    3627CDEFINES    = $(CDEFINES) -DNDEBUG
     28!if "$(VAC3)" == "1" || "$(VAC36)" == "1"
    3729CFLAGS      = $(CFLAGS) -Tdp
    3830CXXFLAGS    = $(CXXFLAGS) -Tdp
    39 !ifdef WAT
     31!else
    4032!error "Compiler not supported yet!"
    4133!endif
     
    6355# Includes the common rules.
    6456#
    65 !include $(PDWIN32_INCLUDE)/pdwin32.post
     57!include $(ODIN32_POST_INC)
    6658
    6759
  • trunk/src/opengl/glut/Makefile

    r4624 r4719  
    1 # $Id: Makefile,v 1.16 2000-11-19 08:58:15 bird Exp $
     1# $Id: Makefile,v 1.17 2000-12-02 23:58:44 bird Exp $
    22
    33#
     
    66#       glut32.dll makefile
    77#
    8 
    9 
    10 #
    11 # Directory macros.
    12 #
    13 PDWIN32_INCLUDE = ..\..\..\include
    14 PDWIN32_LIB     = ..\..\..\lib
    15 PDWIN32_BIN     = ..\..\..\$(OBJDIR)
    16 PDWIN32_TOOLS   = ..\..\..\tools\bin
    178
    189
     
    2617# Compiler, tools, and interference rules.
    2718#
    28 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     19!include ../../../makefile.inc
    2920
    3021
     
    9889#
    9990LIBS = \
    100 $(PDWIN32_LIB)/$(ODINCRT).lib \
     91$(ODIN32_LIB)/$(ODINCRT).lib \
    10192$(RTLLIB_O) \
    102 $(PDWIN32_LIB)\winmm.lib \
    103 $(PDWIN32_LIB)\kernel32.lib \
    104 $(PDWIN32_LIB)\gdi32.lib \
    105 $(PDWIN32_LIB)\user32.lib \
    106 $(PDWIN32_LIB)\glu32.lib \
    107 $(PDWIN32_LIB)\opengl32.lib \
     93$(ODIN32_LIB)/winmm.lib \
     94$(ODIN32_LIB)/kernel32.lib \
     95$(ODIN32_LIB)/gdi32.lib \
     96$(ODIN32_LIB)/user32.lib \
     97$(ODIN32_LIB)/glu32.lib \
     98$(ODIN32_LIB)/opengl32.lib \
    10899os2386.lib
    109100
     
    118109# Includes the common rules.
    119110#
    120 !include $(PDWIN32_INCLUDE)/pdwin32.post
     111!include $(ODIN32_POST_INC)
    121112
    122113
     
    126117mydep:
    127118    $(DEPEND) -a $(CINCLUDES) \
    128         *.c *.cpp *.asm *.inc $(PDWIN32_INCLUDE)\*.h ..\mesa\gl\*.h
     119        *.c *.cpp *.asm *.inc $(ODIN32_INCLUDE)\*.h ..\mesa\gl\*.h
    129120
  • trunk/src/opengl/mesa/3dfx/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.11 2000-11-19 08:58:16 bird Exp $
     1# $Id: makefile,v 1.12 2000-12-02 23:58:37 bird Exp $
     2
    23#
    34# Odin32 API
     
    67#
    78
    8 
    9 #
    10 # Directory macros.
    11 #
    12 PDWIN32_INCLUDE = ..\..\..\..\include
    13 PDWIN32_LIB     = ..\..\..\..\lib
    14 PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)\Glide
    15 PDWIN32_TOOLS   = ..\..\..\..\tools\bin
    169
    1710
     
    2518# Compiler, tools, and interference rules.
    2619#
    27 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     20!include ../../../../makefile.inc
    2821
    2922
     
    3124# Overrides.
    3225#
     26ODIN32_BIN  = $(ODIN32_BIN__)\Glide
    3327CINCLUDES   = -I.. -I..\GL $(CINCLUDES) -I..\..\glut -I..\..\glide\cvg\glide \
    3428              -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc
     
    3832              -DFX -DFX_V2 -DFX_SILENT -DBUILD_GL32 -DFAST_MATH
    3933
     34!if "$(VAC3)" == "1" || "$(VAC36)" == "1"
    4035CFLAGS      = $(CFLAGS) /Wcnd- /Tdp
    41 !ifdef WAT
     36!else
    4237!error "Compiler not supported yet!"
    4338!endif
     
    4843#   This is BAD! Try make library in parent directory? Problem with different objects.
    4944#
     45!ifndef WAT
    5046{..}.c{$(OBJDIR)}.obj:
    5147    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -c -Fo$(OBJDIR)\$(@B).obj $<
     
    5349{..}.asm{$(OBJDIR)}.obj:
    5450    $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $<
     51!else
     52!error "Compiler not supported yet!"
     53!endif
    5554
    5655
     
    163162#
    164163LIBS = \
    165 $(PDWIN32_LIB)/$(ODINCRT).lib \
    166 $(PDWIN32_LIB)\kernel32.lib \
    167 $(PDWIN32_LIB)\gdi32.lib \
    168 $(PDWIN32_LIB)\user32.lib \
    169 $(PDWIN32_LIB)\glide2x.lib \
     164$(ODIN32_LIB)/$(ODINCRT).lib \
     165$(ODIN32_LIB)/kernel32.lib \
     166$(ODIN32_LIB)/gdi32.lib \
     167$(ODIN32_LIB)/user32.lib \
     168$(ODIN32_LIB)/glide2x.lib \
    170169$(RTLLIB_O) \
    171170os2386.lib
     
    181180# Includes the common rules.
    182181#
    183 !include $(PDWIN32_INCLUDE)/pdwin32.post
     182!include $(ODIN32_POST_INC)
    184183
    185184
  • trunk/src/opengl/mesa/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.9 2000-11-19 08:58:15 bird Exp $
     1# $Id: makefile,v 1.10 2000-12-02 23:58:37 bird Exp $
    22
    33#
     
    99
    1010#
    11 # Directory macros.
    12 #
    13 PDWIN32_INCLUDE = ..\..\..\include
    14 PDWIN32_LIB     = ..\..\..\lib
    15 PDWIN32_BIN     = ..\..\..\$(OBJDIR)
    16 PDWIN32_TOOLS   = ..\..\..\tools\bin
    17 
    18 
    19 #
    2011# Compiler, tools, and interference rules.
    2112#
    22 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     13!include ../../../makefile.inc
    2314
    2415
     
    134125#
    135126LIBS = \
    136 $(PDWIN32_LIB)/$(ODINCRT).lib \
    137 $(PDWIN32_LIB)\kernel32.lib \
    138 $(PDWIN32_LIB)\gdi32.lib \
    139 $(PDWIN32_LIB)\user32.lib \
     127$(ODIN32_LIB)/$(ODINCRT).lib \
     128$(ODIN32_LIB)\kernel32.lib \
     129$(ODIN32_LIB)\gdi32.lib \
     130$(ODIN32_LIB)\user32.lib \
    140131$(RTLLIB_O) \
    141132os2386.lib \
     
    152143# Includes the common rules.
    153144#
    154 !include $(PDWIN32_INCLUDE)/pdwin32.post
    155 
    156 
    157 #
    158 # Libs rule to support objectlibrary used by 3dxf.
    159 #
    160 libs: $(OBJDIR)\$(TARGET).lib
    161 
    162 
    163 #
    164 # Internal objectlibrary rule.
    165 #
    166 $(OBJDIR)\$(TARGET).lib: $(OBJS)
    167 !if "$(VAC3)" == "1" | "$(VAC36)" == "1"
    168     $(RM) $(OBJDIR)\$(TARGET)
    169     $(ILIB) $(ILIBFLAGS) $@ @<<
    170 $(OBJS:  = &^
    171 )
    172 $(OBJDIR)\$(@B).lst
    173 <<
    174 !else
    175 !   error "Compiler is not yet supported."
    176 !endif
     145!include $(ODIN32_POST_INC)
    177146
    178147
  • trunk/src/pe2lx/makefile

    r3031 r4719  
    1 # $Id: makefile,v 1.10 2000-03-06 23:38:55 bird Exp $
     1# $Id: makefile,v 1.11 2000-12-02 23:58:01 bird Exp $
    22
    33#
     
    99#
    1010
    11 PDWIN32_INCLUDE = ..\..\include
    12 PDWIN32_LIB = ..\..\lib
    13 PDWIN32_BIN = ..\..\bin
     11OLD_STYLE=1
     12!include ../../makefile.inc
    1413
    1514
    16 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    17 
    18 
    19 CFLAGS = $(CFLAGS) /Ge+ /Tm+ /I$(PDWIN32_INCLUDE) /D__PE2LX__
    20 CXXFLAGS = $(CXXFLAGS) -Ge+ /Tm+ /I$(PDWIN32_INCLUDE) /D__PE2LX__
     15CFLAGS = $(CFLAGS) /Ge+ /Tm+ /I$(ODIN32_INCLUDE) /D__PE2LX__
     16CXXFLAGS = $(CXXFLAGS) -Ge+ /Tm+ /I$(ODIN32_INCLUDE) /D__PE2LX__
    2117LDFLAGS = $(LDFLAGS) -Ge+
    2218
     
    3430$(TARGET).exe: $(OBJS)
    3531        $(LD) $(LDFLAGS) -Fe$@ $(OBJS) \
    36         $(PDWIN32_LIB)\LIBCONV.LIB $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    37         $(CP) $(TARGET).exe $(PDWIN32_BIN)
     32        $(ODIN32_LIB)\LIBCONV.LIB $(ODIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
     33        $(CP) $(TARGET).exe $(ODIN32_BIN)
    3834
    3935
    40 accelerator.obj: accelerator.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h \
     36accelerator.obj: accelerator.cpp $(ODIN32_INCLUDE)\pefile.h lx.h \
    4137                 accelerator.h  icon.h misc.h
    42 bitmap.obj: bitmap.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h \
     38bitmap.obj: bitmap.cpp $(ODIN32_INCLUDE)\pefile.h lx.h \
    4339            bitmap.h icon.h misc.h
    44 cursor.obj: cursor.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h \
     40cursor.obj: cursor.cpp $(ODIN32_INCLUDE)\pefile.h lx.h \
    4541            cursor.h icon.h misc.h
    46 cursorgrp.obj: cursorgrp.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h  \
     42cursorgrp.obj: cursorgrp.cpp $(ODIN32_INCLUDE)\pefile.h lx.h  \
    4743               cursor.h cursorgrp.h misc.h
    48 dialog.obj: dialog.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h \
     44dialog.obj: dialog.cpp $(ODIN32_INCLUDE)\pefile.h lx.h \
    4945            dialog.h misc.h
    50 icon.obj: icon.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h icon.h misc.h
    51 icongrp.obj: icongrp.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h icon.h \
     46icon.obj: icon.cpp $(ODIN32_INCLUDE)\pefile.h lx.h icon.h misc.h
     47icongrp.obj: icongrp.cpp $(ODIN32_INCLUDE)\pefile.h lx.h icon.h \
    5248             icongrp.h misc.h
    5349lx.obj: lx.cpp lx.h
    54 menu.obj: menu.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h menu.h
    55 misc.obj: misc.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h ..\..\include\versionos2.h
    56 pe.obj: pe.cpp $(PDWIN32_INCLUDE)\pefile.h lx.h \
     50menu.obj: menu.cpp $(ODIN32_INCLUDE)\pefile.h lx.h menu.h
     51misc.obj: misc.cpp $(ODIN32_INCLUDE)\pefile.h lx.h ..\..\include\versionos2.h
     52pe.obj: pe.cpp $(ODIN32_INCLUDE)\pefile.h lx.h \
    5753        accelerator.h bitmap.h cursor.h \
    5854        cursorgrp.h dialog.h icon.h \
    5955        icongrp.h menu.h misc.h rcdata.h \
    6056        strings.h
    61 pefile.obj: pefile.cpp $(PDWIN32_INCLUDE)\pefile.h misc.h
     57pefile.obj: pefile.cpp $(ODIN32_INCLUDE)\pefile.h misc.h
    6258rcdata.obj: rcdata.cpp lx.h rcdata.h
    6359strings.obj: strings.cpp lx.h misc.h strings.h
     
    6662clean:
    6763        $(RM) *.obj *.lib *.dll *~ *.map *.pch *.exe
    68         $(RM) $(PDWIN32_BIN)\$(TARGET).exe
     64        $(RM) $(ODIN32_BIN)\$(TARGET).exe
  • trunk/src/pe2lx/makefile.wat

    r272 r4719  
    1 # $Id: makefile.wat,v 1.3 1999-07-05 12:36:12 sandervl Exp $
     1# $Id: makefile.wat,v 1.4 2000-12-02 23:58:01 bird Exp $
    22
    33#===================================================================
     
    66#
    77#===================================================================
    8 PDWIN32_INCLUDE = ..\..\include
    9 PDWIN32_LIB = ..\..\lib
    10 PDWIN32_BIN = ..\..\bin
     8ODIN32_INCLUDE = ..\..\include
     9ODIN32_LIB = ..\..\lib
     10ODIN32_BIN = ..\..\bin
    1111INC     = $(%WATCOM)\h;f:\toolkit\h;.;..\..\include;..\..\include\win
    1212DEF     =
     
    6262FILE5   = accelerator.obj
    6363FILE6   = cursor.obj cursorgrp.obj
    64 FILE7   = $(PDWIN32_LIB)\LIBCONV.LIB
     64FILE7   = $(ODIN32_LIB)\LIBCONV.LIB
    6565FILE8   =
    6666FILE9   =
  • trunk/src/peldr/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.18 2000-11-19 08:57:04 bird Exp $
     1# $Id: makefile,v 1.19 2000-12-02 23:57:55 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
  • trunk/src/peldr/pe.mak

    r4634 r4719  
    1 # $Id: pe.mak,v 1.2 2000-11-19 20:55:24 sandervl Exp $
     1# $Id: pe.mak,v 1.3 2000-12-02 23:57:55 bird Exp $
    22
    33#
     
    1111#
    1212EXETARGET = 1
     13MAKEFILE = pe.mak
    1314
    1415
     
    1617# Compiler, tools, and interference rules.
    1718#
    18 !include ../../include/pdwin32.mk
     19!include ../../makefile.inc
    1920
    2021
     
    4041#
    4142LIBS = \
    42 $(PDWIN32_LIB)/$(ODINCRT).lib \
     43$(ODIN32_LIB)/$(ODINCRT).lib \
    4344$(RTLLIB_O) \
    44 os2386.lib 
     45os2386.lib
    4546
    4647
     
    5455# Includes the common rules.
    5556#
    56 !include $(PDWIN32_INCLUDE)/pdwin32.post
     57!include $(ODIN32_POST_INC)
    5758
  • trunk/src/peldr/pec.mak

    r4634 r4719  
    1 # $Id: pec.mak,v 1.2 2000-11-19 20:55:25 sandervl Exp $
     1# $Id: pec.mak,v 1.3 2000-12-02 23:57:55 bird Exp $
    22
    33#
     
    1111#
    1212EXETARGET = 1
     13MAKEFILE = pec.mak
    1314
    1415
     
    1617# Compiler, tools, and interference rules.
    1718#
    18 !include ../../include/pdwin32.mk
     19!include ../../makefile.inc
    1920
    2021
     
    4041#
    4142LIBS = \
    42 $(PDWIN32_LIB)/$(ODINCRT).lib \
     43$(ODIN32_LIB)/$(ODINCRT).lib \
    4344$(RTLLIB_O) \
    4445os2386.lib
     
    5455# Includes the common rules.
    5556#
    56 !include $(PDWIN32_INCLUDE)/pdwin32.post
     57!include $(ODIN32_POST_INC)
    5758
    5859
  • trunk/src/psapi/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.10 2000-11-19 08:53:32 bird Exp $
     1# $Id: makefile,v 1.11 2000-12-02 23:57: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)/$(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/rasapi32/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.11 2000-11-19 08:51:45 bird Exp $
     1# $Id: makefile,v 1.12 2000-12-02 23:57:41 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/riched32/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.3 2000-11-19 08:51:27 bird Exp $
     1# $Id: makefile,v 1.4 2000-12-02 23:57:35 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    3636#
    3737LIBS = \
    38 $(PDWIN32_LIB)/kernel32.lib \
    39 $(PDWIN32_LIB)/user32.lib \
    40 $(PDWIN32_LIB)/$(ODINCRT).lib \
     38$(ODIN32_LIB)/kernel32.lib \
     39$(ODIN32_LIB)/user32.lib \
     40$(ODIN32_LIB)/$(ODINCRT).lib \
    4141OS2386.LIB \
    4242$(RTLLIB_O)
     
    5252# Includes the common rules.
    5353#
    54 !include $(PDWIN32_INCLUDE)/pdwin32.post
     54!include $(ODIN32_POST_INC)
    5555
  • trunk/src/rpcrt4/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.4 2000-11-19 08:50:47 bird Exp $
     1# $Id: makefile,v 1.5 2000-12-02 23:57:29 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 \
    3838so32dll.lib \
     
    4949# Includes the common rules.
    5050#
    51 !include $(PDWIN32_INCLUDE)/pdwin32.post
     51!include $(ODIN32_POST_INC)
    5252
  • trunk/src/shell32/makefile

    r4691 r4719  
    1 # $Id: makefile,v 1.31 2000-11-24 13:19:12 sandervl Exp $
     1# $Id: makefile,v 1.32 2000-12-02 23:57:22 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    6666#
    6767LIBS = \
    68 $(PDWIN32_LIB)/kernel32.lib \
    69 $(PDWIN32_LIB)/user32.lib \
    70 $(PDWIN32_LIB)/advapi32.lib \
    71 $(PDWIN32_LIB)/gdi32.lib \
    72 $(PDWIN32_LIB)/ole32.lib \
    73 $(PDWIN32_LIB)/version.lib \
    74 $(PDWIN32_LIB)/comctl32.lib \
    75 $(PDWIN32_LIB)/$(ODINCRT).lib \
    76 $(PDWIN32_LIB)/pmwinx.lib \
    77 $(PDWIN32_LIB)/shlwapi.lib \
     68$(ODIN32_LIB)/kernel32.lib \
     69$(ODIN32_LIB)/user32.lib \
     70$(ODIN32_LIB)/advapi32.lib \
     71$(ODIN32_LIB)/gdi32.lib \
     72$(ODIN32_LIB)/ole32.lib \
     73$(ODIN32_LIB)/version.lib \
     74$(ODIN32_LIB)/comctl32.lib \
     75$(ODIN32_LIB)/$(ODINCRT).lib \
     76$(ODIN32_LIB)/pmwinx.lib \
     77$(ODIN32_LIB)/shlwapi.lib \
    7878OS2386.LIB \
    7979$(RTLLIB_O)
     
    8989# Includes the common rules.
    9090#
    91 !include $(PDWIN32_INCLUDE)/pdwin32.post
     91!include $(ODIN32_POST_INC)
    9292
  • trunk/src/shell32/old/makefile

    r1213 r4719  
    1 # $Id: makefile,v 1.1 1999-10-09 11:11:30 sandervl Exp $
     1# $Id: makefile,v 1.2 2000-12-02 23:57:22 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    66#       shell32.dll makefile
    77#
    88
    9 PDWIN32_INCLUDE = ..\..\..\include
    10 PDWIN32_LIB = ..\..\..\lib
    11 PDWIN32_BIN = ..\..\..\bin
    12 PDWIN32_TOOLS = ..\..\..\tools\bin
     9!error "don't work?"
    1310
     11OLD_STYLE=1
     12!include ../../../makefile.inc
    1413
    15 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    16 
    17 
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
    2014
    2115
     
    3024$(TARGET).dll: $(OBJS) $(TARGET).def
    3125        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    32               $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
    33               $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/advapi32.lib \
    34               $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    35         $(CP) $@ $(PDWIN32_BIN)
     26              $(ODIN32_LIB)/pmwinx.lib $(ODIN32_LIB)/kernel32.lib \
     27              $(ODIN32_LIB)/user32.lib $(ODIN32_LIB)/advapi32.lib \
     28              $(ODIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
     29        $(CP) $@ $(ODIN32_BIN)
    3630
    3731
    3832$(TARGET).lib: $(TARGET)exp.def
    3933        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
    40         $(CP) $@ $(PDWIN32_LIB)
     34        $(CP) $@ $(ODIN32_LIB)
    4135
    4236$(TARGET)exp.def: $(TARGET).def
     
    6458clean:
    6559        $(RM) *.obj *.lib *.dll *~ *.map *.pch
    66         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
    67         $(RM) $(PDWIN32_LIB)\$(TARGET).lib
     60        $(RM) $(ODIN32_BIN)\$(TARGET).dll
     61        $(RM) $(ODIN32_LIB)\$(TARGET).lib
    6862
    6963
  • trunk/src/shfolder/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.3 2000-11-19 08:49:45 bird Exp $
     1# $Id: makefile,v 1.4 2000-12-02 23:57:15 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    2626#
    2727LIBS = \
    28 $(PDWIN32_LIB)/kernel32.lib \
    29 $(PDWIN32_LIB)/user32.lib \
    30 $(PDWIN32_LIB)/shell32.lib \
    31 $(PDWIN32_LIB)/$(ODINCRT).lib \
     28$(ODIN32_LIB)/kernel32.lib \
     29$(ODIN32_LIB)/user32.lib \
     30$(ODIN32_LIB)/shell32.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/shlwapi/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.19 2000-11-19 08:49:02 bird Exp $
     1# $Id: makefile,v 1.20 2000-12-02 23:57:08 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    3737#
    3838LIBS = \
    39 $(PDWIN32_LIB)/kernel32.lib \
    40 $(PDWIN32_LIB)/user32.lib \
    41 $(PDWIN32_LIB)/gdi32.lib \
    42 $(PDWIN32_LIB)/crtdll.lib \
    43 $(PDWIN32_LIB)/$(ODINCRT).lib \
     39$(ODIN32_LIB)/kernel32.lib \
     40$(ODIN32_LIB)/user32.lib \
     41$(ODIN32_LIB)/gdi32.lib \
     42$(ODIN32_LIB)/crtdll.lib \
     43$(ODIN32_LIB)/$(ODINCRT).lib \
    4444OS2386.LIB \
    4545$(RTLLIB_O)
     
    5555# Includes the common rules.
    5656#
    57 !include $(PDWIN32_INCLUDE)/pdwin32.post
     57!include $(ODIN32_POST_INC)
    5858
  • trunk/src/tapi32/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.16 2000-11-19 08:48:32 bird Exp $
     1# $Id: makefile,v 1.17 2000-12-02 23:57:02 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/twain_32/makefile

    r4624 r4719  
    1 # $Id: makefile,v 1.7 2000-11-19 08:47:57 bird Exp $
     1# $Id: makefile,v 1.8 2000-12-02 23:56:55 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)/user32.lib \
    37 $(PDWIN32_LIB)/$(ODINCRT).lib \
    38 $(PDWIN32_LIB)/pmwinx.lib \
     35$(ODIN32_LIB)/kernel32.lib \
     36$(ODIN32_LIB)/user32.lib \
     37$(ODIN32_LIB)/$(ODINCRT).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/urlmon/makefile

    r4622 r4719  
    1 # $Id: makefile,v 1.3 2000-11-19 08:40:22 bird Exp $
     1# $Id: makefile,v 1.4 2000-12-02 23:56:48 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)/ole32.lib \
    32 $(PDWIN32_LIB)/$(ODINCRT).lib \
     30$(ODIN32_LIB)/kernel32.lib \
     31$(ODIN32_LIB)/ole32.lib \
     32$(ODIN32_LIB)/$(ODINCRT).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/user32/Makefile

    r4622 r4719  
    1 # $Id: Makefile,v 1.76 2000-11-19 08:40:22 bird Exp $
     1# $Id: Makefile,v 1.77 2000-12-02 23:56:42 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    9898#
    9999LIBS = \
    100 $(PDWIN32_LIB)/gdi32.lib \
    101 $(PDWIN32_LIB)/pmwinx.lib \
    102 $(PDWIN32_LIB)/kernel32.lib \
    103 $(PDWIN32_LIB)/libuls.lib \
    104 $(PDWIN32_LIB)/$(ODINCRT).lib \
     100$(ODIN32_LIB)/gdi32.lib \
     101$(ODIN32_LIB)/pmwinx.lib \
     102$(ODIN32_LIB)/kernel32.lib \
     103$(ODIN32_LIB)/libuls.lib \
     104$(ODIN32_LIB)/$(ODINCRT).lib \
    105105OS2386.LIB \
    106106$(RTLLIB_O)
     
    116116# Includes the common rules.
    117117#
    118 !include $(PDWIN32_INCLUDE)/pdwin32.post
     118!include $(ODIN32_POST_INC)
    119119
  • trunk/src/version/makefile

    r4622 r4719  
    1 # $Id: makefile,v 1.16 2000-11-19 08:39:49 bird Exp $
     1# $Id: makefile,v 1.17 2000-12-02 23:56:35 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)/user32.lib \
    33 $(PDWIN32_LIB)/$(ODINCRT).lib \
    34 $(PDWIN32_LIB)/crtdll.lib \
    35 $(PDWIN32_LIB)/lz32.lib \
     31$(ODIN32_LIB)/kernel32.lib \
     32$(ODIN32_LIB)/user32.lib \
     33$(ODIN32_LIB)/$(ODINCRT).lib \
     34$(ODIN32_LIB)/crtdll.lib \
     35$(ODIN32_LIB)/lz32.lib \
    3636OS2386.LIB \
    3737$(RTLLIB_O)
     
    4747# Includes the common rules.
    4848#
    49 !include $(PDWIN32_INCLUDE)/pdwin32.post
     49!include $(ODIN32_POST_INC)
    5050
  • trunk/src/wing32/makefile

    r4620 r4719  
    1 # $Id: makefile,v 1.9 2000-11-19 08:35:50 bird Exp $
     1# $Id: makefile,v 1.10 2000-12-02 23:56:28 bird Exp $
    22
    33#
    44# Odin32 API
    55#
    6 # wing32.dll makefile
     6#       wing32.dll makefile
    77#
    88
     
    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)/$(ODINCRT).lib \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/user32.lib \
     31$(ODIN32_LIB)/gdi32.lib \
     32$(ODIN32_LIB)/$(ODINCRT).lib \
    3333OS2386.LIB \
    3434$(RTLLIB_O)
     
    4444# Includes the common rules.
    4545#
    46 !include $(PDWIN32_INCLUDE)/pdwin32.post
     46!include $(ODIN32_POST_INC)
    4747
    4848
  • trunk/src/wininet/makefile

    r4620 r4719  
    1 # $Id: makefile,v 1.10 2000-11-19 08:35:50 bird Exp $
     1# $Id: makefile,v 1.11 2000-12-02 23:56:21 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    3030#
    3131LIBS = \
    32 $(PDWIN32_LIB)/kernel32.lib \
    33 $(PDWIN32_LIB)/user32.lib \
    34 $(PDWIN32_LIB)/$(ODINCRT).lib \
    35 $(PDWIN32_LIB)/wsock32.lib \
     32$(ODIN32_LIB)/kernel32.lib \
     33$(ODIN32_LIB)/user32.lib \
     34$(ODIN32_LIB)/$(ODINCRT).lib \
     35$(ODIN32_LIB)/wsock32.lib \
    3636OS2386.LIB \
    3737$(RTLLIB_O)
     
    4747# Includes the common rules.
    4848#
    49 !include $(PDWIN32_INCLUDE)/pdwin32.post
     49!include $(ODIN32_POST_INC)
    5050
  • trunk/src/winmm/makefile

    r4620 r4719  
    1 # $Id: makefile,v 1.20 2000-11-19 08:35:50 bird Exp $
     1# $Id: makefile,v 1.21 2000-12-02 23:55:34 bird Exp $
    22
    33#
     
    1111# Compiler, tools, and interference rules.
    1212#
    13 !include ../../include/pdwin32.mk
     13!include ../../makefile.inc
    1414
    1515
     
    4444#
    4545LIBS = \
    46 $(PDWIN32_LIB)/pmwinx.lib \
     46$(ODIN32_LIB)/pmwinx.lib \
    4747mmpm2.lib \
    48 $(PDWIN32_LIB)/kernel32.lib \
    49 $(PDWIN32_LIB)/user32.lib \
    50 $(PDWIN32_LIB)/$(ODINCRT).lib \
     48$(ODIN32_LIB)/kernel32.lib \
     49$(ODIN32_LIB)/user32.lib \
     50$(ODIN32_LIB)/$(ODINCRT).lib \
    5151OS2386.LIB \
    5252$(RTLLIB_O)
     
    6262# Includes the common rules.
    6363#
    64 !include $(PDWIN32_INCLUDE)/pdwin32.post
     64!include $(ODIN32_POST_INC)
    6565
  • trunk/src/winmm/mcianim/makefile

    r2670 r4719  
    1 # $Id: makefile,v 1.4 2000-02-06 20:52:33 sandervl Exp $
     1# $Id: makefile,v 1.5 2000-12-02 23:55:35 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 #       mcianim.dll makefile
     6#       mcianim.dll makefile
    77#
    88
    9 PDWIN32_INCLUDE = ..\..\..\include
    10 PDWIN32_LIB = ..\..\..\lib
    11 PDWIN32_BIN = ..\..\..\bin
    12 PDWIN32_TOOLS = ..\..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../../makefile.inc
    1314
    1415
    15 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
     19OBJS = \
     20mcianim.obj \
     21mcianimrsrc.obj \
     22$(DLLENTRY)
    1623
    1724
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     25#
     26# Libraries. One space before the '\'.
     27#
     28LIBS = \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/user32.lib \
     31$(ODIN32_LIB)/winmm.lib \
     32$(ODIN32_LIB)/$(ODINCRT).lib \
     33$(ODIN32_LIB)/pmwinx.lib \
     34$(RTLLIB_O) \
     35OS2386.LIB
    2036
    2137
     38#
     39# Target name - name of the dll without extention and path.
     40#
    2241TARGET = mcianim
    2342
    24 OBJS =  mcianim.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2543
    26 all: $(TARGET).dll $(TARGET).lib
     44#
     45# Includes the common rules.
     46#
     47!include $(ODIN32_POST_INC)
    2748
    28 
    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)/winmm.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33         $(CP) $@ $(PDWIN32_BIN)
    34 
    35 
    36 $(TARGET).lib: $(TARGET).def
    37         $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    38         $(CP) $@ $(PDWIN32_LIB)
    39 
    40 resource.asm: $(TARGET).rc
    41     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
    42 
    43 resource.obj: resource.asm
    44 
    45 mcianim.obj: mcianim.cpp
    46 
    47 clean:
    48         $(RM) *.obj *.lib *.dll *.map *.pch
    49         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
    50         $(RM) $(PDWIN32_LIB)\$(TARGET).lib
    51 
    52 
    53 
    54 
    55 
  • trunk/src/winmm/mciavi32/makefile

    r2670 r4719  
    1 # $Id: makefile,v 1.4 2000-02-06 20:52:34 sandervl Exp $
     1# $Id: makefile,v 1.5 2000-12-02 23:55:35 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 #       mciavi32.dll makefile
     6#       mciavi32.dll makefile
    77#
    88
    9 PDWIN32_INCLUDE = ..\..\..\include
    10 PDWIN32_LIB = ..\..\..\lib
    11 PDWIN32_BIN = ..\..\..\bin
    12 PDWIN32_TOOLS = ..\..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../../makefile.inc
    1314
    1415
    15 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
     19OBJS = \
     20mciavi32.obj \
     21mciavi32rsrc.obj \
     22$(DLLENTRY)
    1623
    1724
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     25#
     26# Libraries. One space before the '\'.
     27#
     28LIBS = \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/user32.lib \
     31$(ODIN32_LIB)/winmm.lib \
     32$(ODIN32_LIB)/$(ODINCRT).lib \
     33$(ODIN32_LIB)/pmwinx.lib \
     34OS2386.LIB \
     35$(RTLLIB_O)
    2036
    2137
     38#
     39# Target name - name of the dll without extention and path.
     40#
    2241TARGET = mciavi32
    2342
    24 OBJS =  mciavi32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2543
    26 all: $(TARGET).dll $(TARGET).lib
     44#
     45# Includes the common rules.
     46#
     47!include $(ODIN32_POST_INC)
    2748
    28 
    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)/winmm.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33         $(CP) $@ $(PDWIN32_BIN)
    34 
    35 
    36 $(TARGET).lib: $(TARGET).def
    37         $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    38         $(CP) $@ $(PDWIN32_LIB)
    39 
    40 resource.asm: $(TARGET).rc
    41     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
    42 
    43 resource.obj: resource.asm
    44 
    45 mciavi32.obj: mciavi32.cpp
    46 
    47 clean:
    48         $(RM) *.obj *.lib *.dll *.map *.pch
    49         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
    50         $(RM) $(PDWIN32_LIB)\$(TARGET).lib
    51 
    52 
    53 
    54 
    55 
  • trunk/src/winmm/mcicda/makefile

    r4709 r4719  
    1 # $Id: makefile,v 1.4 2000-12-02 11:37:05 sandervl Exp $
     1# $Id: makefile,v 1.5 2000-12-02 23:53:56 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 #       mcicda.dll makefile
     6#       mcicda.dll makefile
    77#
    88
    9 #
    10 # Directory macros.
    11 #
    12 PDWIN32_INCLUDE = ..\..\..\include
    13 PDWIN32_LIB     = ..\..\..\lib
    14 PDWIN32_BIN     = ..\..\..\$(OBJDIR)
    15 PDWIN32_TOOLS   = ..\..\..\tools\bin
    169
    1710#
    1811# Compiler, tools, and interference rules.
    1912#
    20 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     13!include ../../../makefile.inc
     14
     15
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
     19OBJS = \
     20$(OBJDIR)\mcicda.obj \
     21$(OBJDIR)\cdrom.obj \
     22$(OBJDIR)\mcicdos2rsrc.obj \
     23$(OBJDIR)\os2cdrom.obj \
     24$(DLLENTRY) \
     25
     26
     27#
     28# Libraries. One space before the '\'.
     29#
     30LIBS = \
     31$(ODIN32_LIB)/kernel32.lib \
     32$(ODIN32_LIB)/user32.lib \
     33$(ODIN32_LIB)/winmm.lib \
     34$(ODIN32_LIB)/$(ODINCRT).lib \
     35OS2386.LIB \
     36$(RTLLIB_O)
     37
    2138
    2239#
     
    2542TARGET = mcicdos2
    2643
    27 OBJS =  $(OBJDIR)\mcicda.obj \
    28         $(OBJDIR)\cdrom.obj \
    29         $(OBJDIR)\mcicdos2rsrc.obj \
    30         $(PDWIN32_LIB)/dllentry.obj \
    31         $(OBJDIR)\os2cdrom.obj
    32 
    33 #
    34 # Libraries. One space before the '\'.
    35 #
    36 LIBS = \
    37 $(PDWIN32_LIB)\WINMM.LIB \
    38 $(PDWIN32_LIB)/kernel32.lib \
    39 $(PDWIN32_LIB)/$(ODINCRT).lib \
    40 OS2386.LIB \
    41 $(RTLLIB_O)
    42 
    43 
    4444
    4545#
    4646# Includes the common rules.
    4747#
    48 !include $(PDWIN32_INCLUDE)/pdwin32.post
     48!include $(ODIN32_POST_INC)
  • trunk/src/winmm/mciseq/makefile

    r2670 r4719  
    1 # $Id: makefile,v 1.4 2000-02-06 20:52:34 sandervl Exp $
     1# $Id: makefile,v 1.5 2000-12-02 23:55:36 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 #       mciseq.dll makefile
     6#       mciseq.dll makefile
    77#
    88
    9 PDWIN32_INCLUDE = ..\..\..\include
    10 PDWIN32_LIB = ..\..\..\lib
    11 PDWIN32_BIN = ..\..\..\bin
    12 PDWIN32_TOOLS = ..\..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../../makefile.inc
    1314
    1415
    15 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
     19OBJS = \
     20$(OBJDIR)\mciseq.obj \
     21$(OBJDIR)\mciseqrsrc.obj \
     22$(DLLENTRY)
    1623
    1724
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     25#
     26# Libraries. One space before the '\'.
     27#
     28LIBS = \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/user32.lib \
     31$(ODIN32_LIB)/winmm.lib \
     32$(ODIN32_LIB)/$(ODINCRT).lib \
     33$(ODIN32_LIB)/pmwinx.lib \
     34OS2386.LIB \
     35$(RTLLIB_O)
    2036
    2137
     38#
     39# Target name - name of the dll without extention and path.
     40#
    2241TARGET = mciseq
    2342
    24 OBJS =  mciseq.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2543
    26 all: $(TARGET).dll $(TARGET).lib
     44#
     45# Includes the common rules.
     46#
     47!include $(ODIN32_POST_INC)
    2748
    28 
    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)/winmm.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33         $(CP) $@ $(PDWIN32_BIN)
    34 
    35 
    36 $(TARGET).lib: $(TARGET).def
    37         $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    38         $(CP) $@ $(PDWIN32_LIB)
    39 
    40 resource.asm: $(TARGET).rc
    41     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
    42 
    43 resource.obj: resource.asm
    44 
    45 mciseq.obj: mciseq.cpp
    46 
    47 clean:
    48         $(RM) *.obj *.lib *.dll *.map *.pch
    49         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
    50         $(RM) $(PDWIN32_LIB)\$(TARGET).lib
    51 
    52 
    53 
    54 
    55 
  • trunk/src/winmm/mciwave/makefile

    r2670 r4719  
    1 # $Id: makefile,v 1.4 2000-02-06 20:52:35 sandervl Exp $
     1# $Id: makefile,v 1.5 2000-12-02 23:55:38 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 #       mciwave.dll makefile
     6#       mciwave.dll makefile
    77#
    88
    9 PDWIN32_INCLUDE = ..\..\..\include
    10 PDWIN32_LIB = ..\..\..\lib
    11 PDWIN32_BIN = ..\..\..\bin
    12 PDWIN32_TOOLS = ..\..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../../makefile.inc
    1314
    1415
    15 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
     19OBJS = \
     20$(OBJDIR)\mciwave.obj \
     21$(OBJDIR)\mciwaversrc.obj \
     22$(DLLENTRY)
    1623
    1724
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     25#
     26# Libraries. One space before the '\'.
     27#
     28LIBS = \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/user32.lib \
     31$(ODIN32_LIB)/winmm.lib \
     32$(ODIN32_LIB)/$(ODINCRT).lib \
     33$(ODIN32_LIB)/pmwinx.lib \
     34OS2386.LIB \
     35$(RTLLIB_O)
    2036
    2137
     38#
     39# Target name - name of the dll without extention and path.
     40#
    2241TARGET = mciwave
    2342
    24 OBJS =  mciwave.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2543
    26 all: $(TARGET).dll $(TARGET).lib
     44#
     45# Includes the common rules.
     46#
     47!include $(ODIN32_POST_INC)
    2748
    28 
    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)/winmm.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33         $(CP) $@ $(PDWIN32_BIN)
    34 
    35 
    36 $(TARGET).lib: $(TARGET).def
    37         $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    38         $(CP) $@ $(PDWIN32_LIB)
    39 
    40 resource.asm: $(TARGET).rc
    41     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
    42 
    43 resource.obj: resource.asm
    44 
    45 mciwave.obj: mciwave.cpp
    46 
    47 clean:
    48         $(RM) *.obj *.lib *.dll *.map *.pch
    49         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
    50         $(RM) $(PDWIN32_LIB)\$(TARGET).lib
    51 
    52 
    53 
    54 
    55 
  • trunk/src/winmm/midimap/makefile

    r2670 r4719  
    1 # $Id: makefile,v 1.4 2000-02-06 20:52:36 sandervl Exp $
     1# $Id: makefile,v 1.5 2000-12-02 23:55:38 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 #       midimap.dll makefile
     6#       midimap.dll makefile
    77#
    88
    9 PDWIN32_INCLUDE = ..\..\..\include
    10 PDWIN32_LIB = ..\..\..\lib
    11 PDWIN32_BIN = ..\..\..\bin
    12 PDWIN32_TOOLS = ..\..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../../makefile.inc
    1314
    1415
    15 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
     19OBJS = \
     20midimap.obj \
     21midimaprsrc.obj \
     22$(DLLENTRY)
    1623
    1724
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     25#
     26# Libraries. One space before the '\'.
     27#
     28LIBS = \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/user32.lib \
     31$(ODIN32_LIB)/winmm.lib \
     32$(ODIN32_LIB)/$(ODINCRT).lib \
     33$(ODIN32_LIB)/pmwinx.lib \
     34$(RTLLIB_O) \
     35OS2386.LIB
    2036
    2137
     38#
     39# Target name - name of the dll without extention and path.
     40#
    2241TARGET = midimap
    2342
    24 OBJS =  midimap.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2543
    26 all: $(TARGET).dll $(TARGET).lib
     44#
     45# Includes the common rules.
     46#
     47!include $(ODIN32_POST_INC)
    2748
    28 
    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)/winmm.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33         $(CP) $@ $(PDWIN32_BIN)
    34 
    35 
    36 $(TARGET).lib: $(TARGET).def
    37         $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    38         $(CP) $@ $(PDWIN32_LIB)
    39 
    40 resource.asm: $(TARGET).rc
    41     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
    42 
    43 resource.obj: resource.asm
    44 
    45 midimap.obj: midimap.cpp
    46 
    47 clean:
    48         $(RM) *.obj *.lib *.dll *.map *.pch
    49         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
    50         $(RM) $(PDWIN32_LIB)\$(TARGET).lib
    51 
    52 
    53 
    54 
    55 
  • trunk/src/winmm/wavemap/makefile

    r2670 r4719  
    1 # $Id: makefile,v 1.4 2000-02-06 20:52:36 sandervl Exp $
     1# $Id: makefile,v 1.5 2000-12-02 23:55:40 bird Exp $
    22
    33#
    4 # PD-Win32 API
     4# Odin32 API
    55#
    6 #       wavemap.drv makefile
     6#   wavemap.drv makefile
    77#
    88
    9 PDWIN32_INCLUDE = ..\..\..\include
    10 PDWIN32_LIB = ..\..\..\lib
    11 PDWIN32_BIN = ..\..\..\bin
    12 PDWIN32_TOOLS = ..\..\..\tools\bin
     9
     10#
     11# Compiler, tools, and interference rules.
     12#
     13!include ../../../makefile.inc
    1314
    1415
    15 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     16#
     17# Object files. Prefix with OBJDIR and one space before the '\'.
     18#
     19OBJS = \
     20$(OBJDIR)\msacm32.obj \
     21$(OBJDIR)\msacm32rsrc.obj \
     22$(DLLENTRY)
    1623
    1724
    18 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
    19 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
     25#
     26# Libraries. One space before the '\'.
     27#
     28LIBS = \
     29$(ODIN32_LIB)/kernel32.lib \
     30$(ODIN32_LIB)/user32.lib \
     31$(ODIN32_LIB)/winmm.lib \
     32$(ODIN32_LIB)/$(ODINCRT).lib \
     33$(ODIN32_LIB)/pmwinx.lib \
     34$(RTLLIB_O) \
     35OS2386.LIB
    2036
    2137
     38#
     39# Target name - name of the dll without extention and path.
     40#
    2241TARGET = msacm32
    2342
    24 OBJS =  msacm32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
    2543
    26 all: $(TARGET).drv $(TARGET).lib
     44#
     45# Target extention override.
     46#
     47TARGET_EXTENSION = drv
    2748
     49#
     50# Includes the common rules.
     51#
     52!include $(ODIN32_POST_INC)
    2853
    29 $(TARGET).drv: $(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)/winmm.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
    33         $(CP) $@ $(PDWIN32_BIN)
    34 
    35 
    36 $(TARGET).lib: $(TARGET).def
    37         $(IMPLIB) $(IMPLIBFLAGS) $@ $**
    38         $(CP) $@ $(PDWIN32_LIB)
    39 
    40 resource.asm: $(TARGET).rc
    41     $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
    42 
    43 resource.obj: resource.asm
    44 
    45 msacm32.obj: msacm32.cpp
    46 
    47 clean:
    48         $(RM) *.obj *.lib *.dll *.map *.pch
    49         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
    50         $(RM) $(PDWIN32_LIB)\$(TARGET).lib
    51 
    52 
    53 
    54 
    55 
Note: See TracChangeset for help on using the changeset viewer.