Changeset 2945 for trunk/src/opengl/glu

Timestamp:

Feb 29, 2000, 2:56:52 PM (26 years ago)

Author:

sandervl

Message:

compile fixes

Location:

trunk/src/opengl/glu

Files:

• glu.h (deleted)
• include/gluos.h (modified) (2 diffs)
• makefile (modified) (3 diffs)
• nurbs/interface/glinterface.cpp (modified) (4 diffs)
• nurbs/interface/makefile (modified) (3 diffs)
• nurbs/internals/makefile (modified) (3 diffs)
• nurbs/nurbtess/makefile (modified) (2 diffs)
• tess/makefile (modified) (2 diffs)
• util/makefile (modified) (2 diffs)
• util/project.c (modified) (3 diffs)

trunk/src/opengl/glu/include/gluos.h

@@ -1 @@
-/* $Id: gluos.h,v 1.1 2000-02-09 08:50:55 jeroen Exp $ */
+/* $Id: gluos.h,v 1.2 2000-02-29 13:56:48 sandervl Exp $ */
 /*
 ** gluos.h - operating system dependencies for GLU
 **
-** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glu/include/gluos.h,v 1.1 2000-02-09 08:50:55 jeroen Exp $*/
+** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glu/include/gluos.h,v 1.2 2000-02-29 13:56:48 sandervl Exp $*/
 
 #if defined(_WIN32)
@@ -19 +19 @@
 #else
 #if defined(__WIN32OS2__)
-#include <os2win.h>
-#define GLAPI WIN32API
+#include <windows.h>
 #else
 /* Disable Microsoft-specific keywords */

trunk/src/opengl/glu/makefile

@@ -1 @@
-# $Id: makefile,v 1.9 2000-02-10 01:19:17 bird Exp $
+# $Id: makefile,v 1.10 2000-02-29 13:56:48 sandervl Exp $
 
 #
@@ -26 +26 @@
 !endif
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa\GL
+CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa\GL
 
 TARGET = GLU32
@@ -354 +354 @@
 
 dep:
-    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
+    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win -I..\mesa\GL \
     *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     cd util

trunk/src/opengl/glu/nurbs/interface/glinterface.cpp

@@ -1 @@
-/* $Id: glinterface.cpp,v 1.1 2000-02-09 08:49:01 jeroen Exp $ */
+/* $Id: glinterface.cpp,v 1.2 2000-02-29 13:56:48 sandervl Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
@@ -33 +33 @@
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2000-02-09 08:49:01 $ $Revision: 1.1 $
+** $Date: 2000-02-29 13:56:48 $ $Revision: 1.2 $
 */
 /*
-** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glu/nurbs/interface/glinterface.cpp,v 1.1 2000-02-09 08:49:01 jeroen Exp $
+** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glu/nurbs/interface/glinterface.cpp,v 1.2 2000-02-29 13:56:48 sandervl Exp $
 */
 
@@ -430 +430 @@
 }
 
-extern "C" void GLAPI
-gluNurbsCallback(GLUnurbs *r, GLenum which, GLvoid (*fn)())
+GLUAPI void GLAPIENTRY gluNurbsCallback( GLUnurbsObj *nobj, GLenum which,
+                                         void (GLCALLBACK *fn)() )
 {
     switch (which) {
@@ -446 +446 @@
     case GLU_NURBS_TEXTURE_COORD_DATA:
     case GLU_NURBS_COLOR_DATA:
-#ifdef __WIN32OS2__
-        r->putSurfCallBack(which, (GLvoid (* WIN32API)(...))fn);
-#else
-        r->putSurfCallBack(which, (GLvoid (*)(...))fn);
-#endif
+        nobj->putSurfCallBack(which, (GLvoid (*)(...))fn);
         break;
 
     case GLU_NURBS_ERROR:
-#ifdef __WIN32OS2__
-        r->errorCallback = (void (* WIN32API)( GLenum )) fn;
-#else
-        r->errorCallback = (void (*)( GLenum )) fn;
-#endif
+        nobj->errorCallback = (void (*)( GLenum )) fn;
         break;
     default:
-        r->postError(GLU_INVALID_ENUM);
+        nobj->postError(GLU_INVALID_ENUM);
         return;
     }

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

@@ -1 @@
-# $Id: makefile,v 1.2 2000-02-09 23:40:51 bird Exp $
+# $Id: makefile,v 1.3 2000-02-29 13:56:49 sandervl Exp $
 #
 # PD-Win32 API
@@ -14 +14 @@
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I..\.. -I..\internals -I..\nurbtess -I..\..\..\mesa -I$(PDWIN32_INCLUDE) -I..\..\include
+CINCLUDE=-I..\..\..\mesa\GL -I..\.. -I..\internals -I..\nurbtess -I$(PDWIN32_INCLUDE) -I..\..\include  -I..\..\..\mesa
 
 CFLAGS = $(CFLAGS) $(CINCLUDE)  -DNDEBUG
@@ -28 +28 @@
 dep:
     $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc \
-        ..\internals\*.h ..\nurbtess\*.h ..\..\..\mesa\*.h
+        ..\internals\*.h ..\nurbtess\*.h ..\..\..\mesa\GL\*.h
 
 !ifndef NODEP

trunk/src/opengl/glu/nurbs/internals/makefile

@@ -1 @@
-# $Id: makefile,v 1.2 2000-02-09 23:40:51 bird Exp $
+# $Id: makefile,v 1.3 2000-02-29 13:56:49 sandervl Exp $
 
 #
@@ -15 +15 @@
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa -I..\..\include -I$(PDWIN32_INCLUDE)
+CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I..\..\include -I$(PDWIN32_INCLUDE)
 CDEFS=-DSTANDALONE -DLIBRARYBUILD -DNDEBUG
 
@@ -37 +37 @@
 dep:
     $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc  \
-        ..\nurbtess\*.h ..\..\..\mesa\*.h ..\..\include\*.h
+        ..\nurbtess\*.h ..\..\..\mesa\GL\*.h ..\..\include\*.h
 
 !ifndef NODEP

trunk/src/opengl/glu/nurbs/nurbtess/makefile

@@ -1 @@
-# $Id: makefile,v 1.2 2000-02-09 23:40:51 bird Exp $
+# $Id: makefile,v 1.3 2000-02-29 13:56:49 sandervl Exp $
 
 #
@@ -16 +16 @@
 
 
-CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa -I$(PDWIN32_INCLUDE) -I..\..\include
+CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I$(PDWIN32_INCLUDE) -I..\..\include
 
 CFLAGS = $(CFLAGS) $(CINCLUDE) -DNDEBUG

trunk/src/opengl/glu/tess/makefile

@@ -1 @@
-# $Id: makefile,v 1.2 2000-02-09 23:40:51 bird Exp $
+# $Id: makefile,v 1.3 2000-02-29 13:56:50 sandervl Exp $
 #
 # PD-Win32 API
@@ -14 +14 @@
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include
+CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include -I..\..\mesa\GL
 CDEFS=-DNDEBUG -Tdp
 

trunk/src/opengl/glu/util/makefile

@@ -1 @@
-# $Id: makefile,v 1.2 2000-02-09 23:40:51 bird Exp $
+# $Id: makefile,v 1.3 2000-02-29 13:56:50 sandervl Exp $
 #
 # PD-Win32 API
@@ -14 +14 @@
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include
+CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include -I..\..\mesa\GL
 
 CFLAGS = $(CFLAGS) $(CINCLUDE) -Tdp -DNDEBUG

trunk/src/opengl/glu/util/project.c

@@ -1 @@
-/* $Id: project.c,v 1.1 2000-02-09 08:47:14 jeroen Exp $ */
+/* $Id: project.c,v 1.2 2000-02-29 13:56:50 sandervl Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
@@ -33 +33 @@
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2000-02-09 08:47:14 $ $Revision: 1.1 $
-** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glu/util/project.c,v 1.1 2000-02-09 08:47:14 jeroen Exp $
+** $Date: 2000-02-29 13:56:50 $ $Revision: 1.2 $
+** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glu/util/project.c,v 1.2 2000-02-29 13:56:50 sandervl Exp $
 */
 
@@ -367 +367 @@
 }
 
-void GLAPI
-gluPickMatrix(GLdouble x, GLdouble y, GLdouble deltax, GLdouble deltay,
-                  GLint viewport[4])
+GLUAPI void GLAPIENTRY gluPickMatrix(GLdouble x, GLdouble y, GLdouble deltax, GLdouble deltay,
+                                     const GLint viewport[4])
 {
     if (deltax <= 0 || deltay <= 0) {