Changeset 2961 for trunk/src

Timestamp:

Mar 1, 2000, 3:50:17 PM (25 years ago)

Author:

sandervl

Message:

activated mesa gl build

Location:

trunk/src/opengl

Files:

• glu/nurbs/interface/makefile (modified) (2 diffs)
• makefile (modified) (6 diffs)
• mesa/3dfx/makefile (modified) (3 diffs)
• mesa/makefile (modified) (2 diffs)

trunk/src/opengl/glu/nurbs/interface/makefile

@@ -1 @@
-# $Id: makefile,v 1.4 2000-03-01 10:44:25 bird Exp $
+# $Id: makefile,v 1.5 2000-03-01 14:50:16 sandervl Exp $
 #
 # PD-Win32 API
@@ -28 +28 @@
 dep:
     $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc \
-        ..\internals\*.h ..\nurbtess\*.h
-# removed: ..\..\..\mesa\GL\*.h - cyclic dep: gl.h <-> mesa_wgl.h
+        ..\internals\*.h ..\nurbtess\*.h ..\..\..\mesa\GL\*.h
 
 !ifndef NODEP

trunk/src/opengl/makefile

@@ -1 @@
-# $Id: makefile,v 1.12 2000-03-01 14:26:49 sandervl Exp $
+# $Id: makefile,v 1.13 2000-03-01 14:50:16 sandervl Exp $
 #
 # PD-Win32 API
@@ -33 +33 @@
 TARGET4  = glide
 DTARGET4 = glide2x
+TARGET5  = mesa
+DTARGET5 = opengl32
+TARGET6  = 3dfxmesa
 
 OBJS1=  opengl32.obj initterm.obj resource.obj
 
-all: $(TARGET1).dll $(TARGET1).lib \
-     $(TARGET2).dll $(TARGET2).lib \
-     $(TARGET3).dll $(TARGET3).lib $(TARGET4)
+#all: $(TARGET1).dll $(TARGET1).lib \
+all: $(TARGET5) $(TARGET2).dll $(TARGET2).lib \
+     $(TARGET3).dll $(TARGET3).lib $(TARGET4) $(TARGET6)
 
 $(TARGET1).dll: $(OBJS1) $(TARGET1).def
@@ -88 +91 @@
     cd ..
 
+$(TARGET5):
+    cd mesa
+    $(MAKE_CMD)
+    cd ..
+
+$(TARGET6):
+    cd mesa\3dfx
+    $(MAKE_CMD)
+    cd ..\..
+
 lib: $(TARGET1).lib $(PDWIN32_LIB)\$(DTARGET1).lib \
      $(TARGET2).lib $(PDWIN32_LIB)\$(DTARGET2).lib \
      $(TARGET3).lib $(PDWIN32_LIB)\$(DTARGET3).lib \
-     $(PDWIN32_LIB)\$(DTARGET4).lib
+     $(PDWIN32_LIB)\$(DTARGET4).lib \
+     $(PDWIN32_LIB)\$(DTARGET5).lib 
 
 $(PDWIN32_LIB)\$(DTARGET1).lib: $(TARGET1).lib
@@ -107 +121 @@
     cd ..
 
+$(PDWIN32_LIB)\$(DTARGET5).lib:
+    cd mesa
+    $(MAKE_CMD) lib
+    cd ..
+
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
@@ -116 +135 @@
     cd ..\glide
     $(MAKE_CMD) NODEP=1 dep
-    cd ..
+    cd ..\mesa
+    $(MAKE_CMD) NODEP=1 dep
+    cd 3dfx
+    $(MAKE_CMD) NODEP=1 dep
+    cd ..\..
 
 !ifndef NODEP
@@ -132 +155 @@
     cd ..\glide
     $(MAKE_CMD) clean
-    cd ..
+    cd ..\mesa
+    $(MAKE_CMD) clean
+    cd 3dfx
+    $(MAKE_CMD) clean
+    cd ..\..
 

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

@@ -1 @@
-# $Id: makefile,v 1.2 2000-03-01 14:26:49 sandervl Exp $
+# $Id: makefile,v 1.3 2000-03-01 14:50:17 sandervl Exp $
 #
 # PD-Win32
@@ -26 +26 @@
 TARGET = OPENGL32
 
-all: $(TARGET).DLL $(TARGET).LIB
+all: $(TARGET).DLL
 
 OBJS =  fxapi.obj \
@@ -84 +84 @@
 
 clean:
-        $(RM) *.obj *.dll *.lib *.lrf
+        $(RM) *.obj 
+        $(RM) *.dll 
+        $(RM) *.lib 
+        $(RM) *.lrf
+        $(RM) resource.asm
         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
         $(RM) $(PDWIN32_LIB)\$(TARGET).lib

trunk/src/opengl/mesa/makefile

@@ -1 @@
-# $Id: makefile,v 1.1 2000-02-29 00:50:06 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-01 14:50:16 sandervl Exp $
 #
 # PD-Win32
@@ -137 +137 @@
 
 clean:
-        $(RM) *.obj *.dll *.lib *.lrf
+        $(RM) *.obj 
+        $(RM) *.dll 
+        $(RM) *.lib 
+        $(RM) *.lrf
+        $(RM) resource.asm
+        $(RM) $(TARGET)exp.def
         $(RM) $(PDWIN32_BIN)\$(TARGET).dll
         $(RM) $(PDWIN32_LIB)\$(TARGET).lib