Changeset 4719 for trunk/src/opengl/mesa

Timestamp:

Dec 3, 2000, 12:59:51 AM (25 years ago)

Author:

bird

Message:

New makefile style. (addjustments)

Location:

trunk/src/opengl/mesa

Files:

• 3dfx/makefile (modified) (9 diffs)
• makefile (modified) (4 diffs)

trunk/src/opengl/mesa/3dfx/makefile

@@ -1 @@
-# $Id: makefile,v 1.11 2000-11-19 08:58:16 bird Exp $
+# $Id: makefile,v 1.12 2000-12-02 23:58:37 bird Exp $
+
 #
 # Odin32 API
@@ -6 +7 @@
 #
 
-
-#
-# Directory macros.
-#
-PDWIN32_INCLUDE = ..\..\..\..\include
-PDWIN32_LIB     = ..\..\..\..\lib
-PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)\Glide
-PDWIN32_TOOLS   = ..\..\..\..\tools\bin
 
 
@@ -25 +18 @@
 # Compiler, tools, and interference rules.
 #
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
+!include ../../../../makefile.inc
 
 
@@ -31 +24 @@
 # Overrides.
 #
+ODIN32_BIN  = $(ODIN32_BIN__)\Glide
 CINCLUDES   = -I.. -I..\GL $(CINCLUDES) -I..\..\glut -I..\..\glide\cvg\glide \
               -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc
@@ -38 +32 @@
               -DFX -DFX_V2 -DFX_SILENT -DBUILD_GL32 -DFAST_MATH
 
+!if "$(VAC3)" == "1" || "$(VAC36)" == "1"
 CFLAGS      = $(CFLAGS) /Wcnd- /Tdp
-!ifdef WAT
+!else
 !error "Compiler not supported yet!"
 !endif
@@ -48 +43 @@
 #   This is BAD! Try make library in parent directory? Problem with different objects.
 #
+!ifndef WAT
 {..}.c{$(OBJDIR)}.obj:
     $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -c -Fo$(OBJDIR)\$(@B).obj $<
@@ -53 +49 @@
 {..}.asm{$(OBJDIR)}.obj:
     $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $<
+!else
+!error "Compiler not supported yet!"
+!endif
 
 
@@ -163 +162 @@
 #
 LIBS = \
-$(PDWIN32_LIB)/$(ODINCRT).lib \
-$(PDWIN32_LIB)\kernel32.lib \
-$(PDWIN32_LIB)\gdi32.lib \
-$(PDWIN32_LIB)\user32.lib \
-$(PDWIN32_LIB)\glide2x.lib \
+$(ODIN32_LIB)/$(ODINCRT).lib \
+$(ODIN32_LIB)/kernel32.lib \
+$(ODIN32_LIB)/gdi32.lib \
+$(ODIN32_LIB)/user32.lib \
+$(ODIN32_LIB)/glide2x.lib \
 $(RTLLIB_O) \
 os2386.lib
@@ -181 +180 @@
 # Includes the common rules.
 #
-!include $(PDWIN32_INCLUDE)/pdwin32.post
+!include $(ODIN32_POST_INC)
 
 

trunk/src/opengl/mesa/makefile

@@ -1 @@
-# $Id: makefile,v 1.9 2000-11-19 08:58:15 bird Exp $
+# $Id: makefile,v 1.10 2000-12-02 23:58:37 bird Exp $
 
 #
@@ -9 +9 @@
 
 #
-# Directory macros.
-#
-PDWIN32_INCLUDE = ..\..\..\include
-PDWIN32_LIB     = ..\..\..\lib
-PDWIN32_BIN     = ..\..\..\$(OBJDIR)
-PDWIN32_TOOLS   = ..\..\..\tools\bin
-
-
-#
 # Compiler, tools, and interference rules.
 #
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
+!include ../../../makefile.inc
 
 
@@ -134 +125 @@
 #
 LIBS = \
-$(PDWIN32_LIB)/$(ODINCRT).lib \
-$(PDWIN32_LIB)\kernel32.lib \
-$(PDWIN32_LIB)\gdi32.lib \
-$(PDWIN32_LIB)\user32.lib \
+$(ODIN32_LIB)/$(ODINCRT).lib \
+$(ODIN32_LIB)\kernel32.lib \
+$(ODIN32_LIB)\gdi32.lib \
+$(ODIN32_LIB)\user32.lib \
 $(RTLLIB_O) \
 os2386.lib \
@@ -152 +143 @@
 # Includes the common rules.
 #
-!include $(PDWIN32_INCLUDE)/pdwin32.post
-
-
-#
-# Libs rule to support objectlibrary used by 3dxf.
-#
-libs: $(OBJDIR)\$(TARGET).lib
-
-
-#
-# Internal objectlibrary rule.
-#
-$(OBJDIR)\$(TARGET).lib: $(OBJS)
-!if "$(VAC3)" == "1" | "$(VAC36)" == "1"
-    $(RM) $(OBJDIR)\$(TARGET)
-    $(ILIB) $(ILIBFLAGS) $@ @<<
-$(OBJS:  = &^
-)
-$(OBJDIR)\$(@B).lst
-<<
-!else
-!   error "Compiler is not yet supported."
-!endif
+!include $(ODIN32_POST_INC)