Changeset 4719 for trunk/src/opengl


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

New makefile style. (addjustments)

Location:
trunk/src/opengl
Files:
7 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
Note: See TracChangeset for help on using the changeset viewer.