Changeset 13539

Timestamp:

Mar 1, 2000, 3:26:49 PM (25 years ago)

Author:

sandervl

Message:

fixes build problems

Location:

tags/trunk/src/opengl

Files:

• glide/cvg/glide/makefile (modified) (2 diffs)
• glide/cvg/makefile (modified) (2 diffs)
• makefile (modified) (2 diffs)
• mesa/3dfx/makefile (modified) (3 diffs)
• mesa/GL/gl.h (modified) (2 diffs)

tags/trunk/src/opengl/glide/cvg/glide/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.1 2000-02-25 00:37:43 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-01 14:26:49 sandervl Exp $
 #
 # PD-Win32 API
@@ -18 +18 @@
 CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\texus;..\..\swlibs\pcilib;$(PDWIN32_INCLUDE)
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
+CFLAGS = $(CFLAGS) $(CINCLUDE) /Os-
+CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) /Os-
 
 OBJS =  CPUDTECT.OBJ    DDGUMP.OBJ      DIGLIDE.OBJ     DIGUTEX.OBJ     DISST.OBJ \

tags/trunk/src/opengl/glide/cvg/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.4 2000-02-27 19:10:01 sandervl Exp $
+# $Id: makefile,v 1.5 2000-03-01 14:26:49 sandervl Exp $
 #
 # PD-Win32 API
@@ -30 +30 @@
     cd ..\swlibs\pcilib
     $(MAKE_CMD)
-    cd ..\..\sst1
+    cd ..\..\cvg
 
 init\init.lib:

tags/trunk/src/opengl/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.11 2000-02-25 00:57:10 sandervl Exp $
+# $Id: makefile,v 1.12 2000-03-01 14:26:49 sandervl Exp $
 #
 # PD-Win32 API
@@ -15 +15 @@
 
 
-!ifdef DEBUG
-!ifdef NODEBUGINFO
-MAKE_CMD=nmake DEBUG=1 NODEBUGINFO=1
-!else
-MAKE_CMD=nmake DEBUG=1
-!endif
-!else
+#SvL: Only build the release version of glide, mesa & glu(t)
+#     There's no need for debug (even without dbg info) builds in the daily build archive
 MAKE_CMD=nmake
-!endif
 
 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)

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

@@ -1 @@
-# $Id: makefile,v 1.1 2000-02-29 00:46:20 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-01 14:26:49 sandervl Exp $
 #
 # PD-Win32
@@ -56 +56 @@
 $(TARGET).DLL: $(OBJS) $(TARGET).lrf $(TARGET).def
     -ILINK /FREE /NOE $(L) @$(TARGET).lrf
-    $(CP) $@ $(PDWIN32_BIN)
+    $(CP) $@ $(PDWIN32_BIN)\Glide
 
 $(TARGET).lrf: makefile
@@ -71 +71 @@
 $(TARGET).def
 <<keep
-
-$(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
 
 resource.asm: fxmesa32.rc

tags/trunk/src/opengl/mesa/GL/gl.h ¶

@@ -1 @@
-/* $Id: gl.h,v 1.2 2000-02-29 13:56:52 sandervl Exp $ */
+/* $Id: gl.h,v 1.3 2000-03-01 14:26:49 sandervl Exp $ */
 
 /*
@@ -99 +99 @@
 typedef void *HDC;
 typedef unsigned long COLORREF;
-#endif
-
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(OPENSTEP)
-#       define WGL_FONT_LINES      0
-#       define WGL_FONT_POLYGONS   1
-#       ifdef UNICODE
-#               define wglUseFontBitmaps  wglUseFontBitmapsW
-#               define wglUseFontOutlines  wglUseFontOutlinesW
-#       else
-#               define wglUseFontBitmaps  wglUseFontBitmapsA
-#               define wglUseFontOutlines  wglUseFontOutlinesA
-#       endif /* !UNICODE */
-typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;
-typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
-typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
-#include <gl/mesa_wgl.h>
 #endif