Changeset 4720


Ignore:
Timestamp:
Dec 3, 2000, 1:26:15 AM (24 years ago)
Author:
bird
Message:

New makefile style. (addjustments)

Location:
trunk/src/opengl
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/src/opengl/glide/cvg/glide/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.5 2000-11-19 08:58:11 bird Exp $
     1# $Id: makefile,v 1.6 2000-12-03 00:26:12 bird Exp $
    22
    33#
    … …  
    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#
    … …  
    2518# Compiler, tools, and interference rules.
    2619#
    27 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    28 !include ..\3dfx.mak
     20!include ../../../../../makefile.inc
     21!include ../3dfx.mak
    2922
    3023
    … …  
    7972# Includes the common rules.
    8073#
    81 !include $(PDWIN32_INCLUDE)/pdwin32.post
     74!include $(ODIN32_POST_INC)
    8275
    8376

  • TabularUnified trunk/src/opengl/glide/cvg/init/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.3 2000-11-19 08:58:11 bird Exp $
     1# $Id: makefile,v 1.4 2000-12-03 00:26:12 bird Exp $
     2
    23#
    34# Odin32 API
    … …  
    56#       cvg\Init 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!include ..\3dfx.mak
    3022
    … …  
    6153# Includes the common rules.
    6254#
    63 !include $(PDWIN32_INCLUDE)/pdwin32.post
     55!include $(ODIN32_POST_INC)
    6456
    6557

  • TabularUnified trunk/src/opengl/glide/cvg/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.11 2000-11-19 08:58:10 bird Exp $
     1# $Id: makefile,v 1.12 2000-12-03 00:26:11 bird Exp $
    22
    33#
    … …  
    66#       Glide\cvg makefile
    77#
    8 
    9 
    10 #
    11 # Directory macros.
    12 #
    13 PDWIN32_INCLUDE = ..\..\..\..\include
    14 PDWIN32_LIB     = ..\..\..\..\lib
    15 PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)\Glide\Voodoo2
    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
    … …  
    5445init\$(OBJDIR)/init.lib \
    5546glide\$(OBJDIR)/glide.lib \
    56 $(PDWIN32_LIB)/kernel32.lib \
    57 $(PDWIN32_LIB)/$(ODINCRT).lib \
     47$(ODIN32_LIB)/kernel32.lib \
     48$(ODIN32_LIB)/$(ODINCRT).lib \
    5849os2386.lib \
    5950$(RTLLIB_O)
    … …  
    6960# Includes the common rules.
    7061#
    71 !include $(PDWIN32_INCLUDE)/pdwin32.post
     62!include $(ODIN32_POST_INC)
    7263

  • TabularUnified trunk/src/opengl/glide/cvg/texus/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.3 2000-11-19 08:58:11 bird Exp $
     1# $Id: makefile,v 1.4 2000-12-03 00:26:12 bird Exp $
     2
    23#
    3 # PD-Win32 API
     4# Odin32 API
    45#
    56#       Glide makefile
    67#
    7 
    8 #
    9 # Directory macros.
    10 #
    11 PDWIN32_INCLUDE = ..\..\..\..\..\include
    12 PDWIN32_LIB     = ..\..\..\..\..\lib
    13 PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
    14 PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
    158
    169
    … …  
    2518# Compiler, tools, and interference rules.
    2619#
    27 !include $(PDWIN32_INCLUDE)/pdwin32.mk
    28 !include ..\3dfx.mak
     20!include ../../../../../makefile.inc
     21!include ../3dfx.mak
    2922
    3023
    … …  
    6962# Includes the common rules.
    7063#
    71 !include $(PDWIN32_INCLUDE)/pdwin32.post
     64!include $(ODIN32_POST_INC)
    7265
    7366

  • TabularUnified trunk/src/opengl/glide/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.7 2000-11-19 08:58:10 bird Exp $
     1# $Id: makefile,v 1.8 2000-12-03 00:26:11 bird Exp $
     2
    23#
    34# Odin32 API
    … …  
    89
    910#
    10 # Directories
    11 #
    12 PDWIN32_INCLUDE = ..\..\..\include
    13 PDWIN32_TOOLS   = ..\..\..\tools\bin
    14 
    15 
    16 #
    1711# Common tools macros. (MAKE_CMD)
    1812#
    19 !include $(PDWIN32_INCLUDE)/pdwin32.tools
     13!include ../../../makefile.inc
    2014
    2115
    … …  
    2519
    2620# All, Lib, Clean and Dep rules.
    27 dep clean lib all:
    28     cd cvg
    29     $(MAKE_CMD) $@
    30     cd ..\sst1
    31     $(MAKE_CMD) $@
    32     cd ..
     21$(COMMONRULES):
     22    $(DODIRS) "cvg sst1" $(MAKE_CMD) $@
    3323

  • TabularUnified trunk/src/opengl/glide/sst1/glide/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.3 2000-11-19 08:58:11 bird Exp $
     1# $Id: makefile,v 1.4 2000-12-03 00:26:13 bird Exp $
     2
    23#
    34# Odin32 API
    … …  
    56#       sst1/Glide 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!include ..\3dfx.mak
    3022
    … …  
    7870# Includes the common rules.
    7971#
    80 !include $(PDWIN32_INCLUDE)/pdwin32.post
     72!include $(ODIN32_POST_INC)
    8173
    8274

  • TabularUnified trunk/src/opengl/glide/sst1/init/initvg/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.3 2000-11-19 08:58:12 bird Exp $
     1# $Id: makefile,v 1.4 2000-12-03 00:26:13 bird Exp $
     2
    23#
    3 # PD-Win32 API
     4# Odin32 API
    45#
    56#       sst1/init/inivg 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!include ..\..\3dfx.mak
    3022
    … …  
    6153# Includes the common rules.
    6254#
    63 !include $(PDWIN32_INCLUDE)/pdwin32.post
     55!include $(ODIN32_POST_INC)
    6456
    6557

  • TabularUnified trunk/src/opengl/glide/sst1/init/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.4 2000-11-19 08:58:11 bird Exp $
     1# $Id: makefile,v 1.5 2000-12-03 00:26:13 bird Exp $
     2
    23#
    34# Odin32 API
    … …  
    56#       sst1\Init 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!include ..\3dfx.mak
    3022
    … …  
    6355# Includes the common rules.
    6456#
    65 !include $(PDWIN32_INCLUDE)/pdwin32.post
     57!include $(ODIN32_POST_INC)
    6658
    6759

  • TabularUnified trunk/src/opengl/glide/sst1/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.8 2000-11-19 08:58:11 bird Exp $
     1# $Id: makefile,v 1.9 2000-12-03 00:26:12 bird Exp $
    22
    33#
    … …  
    66#       sst1\Glide makefile
    77#
    8 
    9 
    10 #
    11 # Directory macros.
    12 #
    13 PDWIN32_INCLUDE = ..\..\..\..\include
    14 PDWIN32_LIB     = ..\..\..\..\lib
    15 PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)\Glide\Voodoo1
    16 PDWIN32_TOOLS   = ..\..\..\..\tools\bin
    178
    189
    … …  
    2617# Compiler, tools, and interference rules.
    2718#
    28 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     19!include ../../../../makefile.inc
     20
     21
     22#
     23# Overrides.
     24#
     25ODIN32_BIN = $(ODIN32_BIN__)\Glide\Voodoo1
    2926
    3027
    … …  
    5552init/initvg/$(OBJDIR)/initvg.lib \
    5653glide/$(OBJDIR)/glide.lib \
    57 $(PDWIN32_LIB)/kernel32.lib \
    58 $(PDWIN32_LIB)/$(ODINCRT).lib \
     54$(ODIN32_LIB)/kernel32.lib \
     55$(ODIN32_LIB)/$(ODINCRT).lib \
    5956OS2386.LIB \
    6057$(RTLLIB_O)
    … …  
    7067# Includes the common rules.
    7168#
    72 !include $(PDWIN32_INCLUDE)/pdwin32.post
     69!include $(ODIN32_POST_INC)
    7370

  • TabularUnified trunk/src/opengl/glide/sst1/texus/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.3 2000-11-19 08:58:12 bird Exp $
     1# $Id: makefile,v 1.4 2000-12-03 00:26:13 bird Exp $
    22
    33#
    … …  
    66#       sst1/Texus 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
    30 !include ..\3dfx.mak
     20!include ../../../../../makefile.inc
     21!include ../3dfx.mak
    3122
    3223
    … …  
    7162# Includes the common rules.
    7263#
    73 !include $(PDWIN32_INCLUDE)/pdwin32.post
     64!include $(ODIN32_POST_INC)
    7465
    7566

  • TabularUnified trunk/src/opengl/glide/swlibs/pcilib/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.4 2000-11-19 08:58:12 bird Exp $
     1# $Id: makefile,v 1.5 2000-12-03 00:26:14 bird Exp $
     2
    23#
    34# Odin32 API
    … …  
    56#       swlibs\pcilib 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!include ..\..\sst1\3dfx.mak
    3022
    … …  
    5547# Includes the common rules.
    5648#
    57 !include $(PDWIN32_INCLUDE)/pdwin32.post
     49!include $(ODIN32_POST_INC)
    5850
    5951

  • TabularUnified trunk/src/opengl/glu/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.14 2000-11-19 08:58:13 bird Exp $
     1# $Id: makefile,v 1.15 2000-12-03 00:26:14 bird Exp $
    22
    33#
    44# Odin32 API
    55#
    6 # Top-level makefile for glu32
     6#       Top-level makefile for glu32
    77#
    88
    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 #
    1911# Compiler, tools, and interference rules.
    2012#
    21 !include $(PDWIN32_INCLUDE)/pdwin32.mk
     13!include ../../../makefile.inc
    2214
    2315
    … …  
    5446tess\$(OBJDIR)\tess.lib \
    5547util\$(OBJDIR)\util.lib \
    56 $(PDWIN32_LIB)/$(ODINCRT).lib \
    57 $(PDWIN32_LIB)\kernel32.lib \
    58 $(PDWIN32_LIB)\opengl32.lib \
     48$(ODIN32_LIB)/$(ODINCRT).lib \
     49$(ODIN32_LIB)\kernel32.lib \
     50$(ODIN32_LIB)\opengl32.lib \
    5951$(RTLLIB_O) \
    6052os2386.lib
    … …  
    7062# Includes the common rules.
    7163#
    72 !include $(PDWIN32_INCLUDE)/pdwin32.post
     64!include $(ODIN32_POST_INC)
    7365

  • TabularUnified trunk/src/opengl/glu/nurbs/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.7 2000-11-19 08:58:13 bird Exp $
     1# $Id: makefile,v 1.8 2000-12-03 00:26:15 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

  • TabularUnified trunk/src/opengl/glu/nurbs/nurbtess/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.5 2000-11-19 08:58:14 bird Exp $
     1# $Id: makefile,v 1.6 2000-12-03 00:25:51 bird Exp $
    22
    33#
    … …  
    66#       glu/nurbs/nurbtess 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
    … …  
    7162# Includes the common rules.
    7263#
    73 !include $(PDWIN32_INCLUDE)/pdwin32.post
     64!include $(ODIN32_POST_INC)
    7465
    7566

  • TabularUnified trunk/src/opengl/makefile

    r4624 r4720  
    1 # $Id: makefile,v 1.18 2000-11-19 08:58:10 bird Exp $
     1# $Id: makefile,v 1.19 2000-12-03 00:26:11 bird Exp $
    22#
    33# Odin32 API
    … …  
    88
    99# Common tools macros. (MAKE_CMD)
    10 !include ../../include/pdwin32.mk
     10!include ../../makefile.inc
    1111
    1212
    … …  
    2323.\mesa\3dfx
    2424
    25 # All, Lib, Clean and Dep rules.
    26 clean dep all lib:
     25# All the common rules like all, lib, clean and dep.
     26$(COMMONRULES):
    2727    $(DODIRS) "$(SUBDIRS)" $(MAKE_CMD) $@
    2828
     29
Note: See TracChangeset for help on using the changeset viewer.