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

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

Location:
trunk/src/opengl/glide/cvg
Files:
2 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

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

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

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

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

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

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

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

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