From 3d53234c63a6dd6c51ea91edacee58737d88c273 Mon Sep 17 00:00:00 2001 From: ikits Date: Thu, 1 May 2003 19:35:38 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@51 783a27ee-832a-0410-bc00-9f386506c6dd --- build/vc6/glew.dsw | 8 ++-- build/vc6/glew_shared.dsp | 2 +- build/vc6/glewinfo.dsp | 4 +- build/vc6/wglinfo.dsp | 4 +- include/GL/glew.h | 92 +++++++++++++++++++-------------------- src/wglinfo.c | 2 +- 6 files changed, 56 insertions(+), 56 deletions(-) diff --git a/build/vc6/glew.dsw b/build/vc6/glew.dsw index 2cf6ef2..bcccde8 100644 --- a/build/vc6/glew.dsw +++ b/build/vc6/glew.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "glew"=.\glew_shared.dsp - Package Owner=<4> +Project: "glew_shared"=.\glew_shared.dsp - Package Owner=<4> Package=<5> {{{ @@ -11,9 +11,6 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name glew_static - End Project Dependency }}} ############################################################################### @@ -53,6 +50,9 @@ Package=<5> Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name glew_static + End Project Dependency }}} ############################################################################### diff --git a/build/vc6/glew_shared.dsp b/build/vc6/glew_shared.dsp index 1d563b3..aa3ecb6 100644 --- a/build/vc6/glew_shared.dsp +++ b/build/vc6/glew_shared.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 opengl32.lib /nologo /dll /machine:I386 /def:"glew32.def" /out:"../../lib/shared/glew32.dll" /ignore:4089 +# ADD LINK32 opengl32.lib /nologo /dll /machine:I386 /out:"../../lib/shared/glew32.dll" /ignore:4089 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "glew_shared - Win32 Debug" diff --git a/build/vc6/glewinfo.dsp b/build/vc6/glewinfo.dsp index dfa506d..922b27d 100644 --- a/build/vc6/glewinfo.dsp +++ b/build/vc6/glewinfo.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "GLEW_STATIC" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/build/vc6/wglinfo.dsp b/build/vc6/wglinfo.dsp index 000d461..6d72f09 100644 --- a/build/vc6/wglinfo.dsp +++ b/build/vc6/wglinfo.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "GLEW_STATIC" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/include/GL/glew.h b/include/GL/glew.h index 4e2dfe6..6b46bd9 100644 --- a/include/GL/glew.h +++ b/include/GL/glew.h @@ -3909,52 +3909,52 @@ typedef void (APIENTRY * PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, typedef void (APIENTRY * PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalf *v); typedef void (APIENTRY * PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalf *v); -extern PFNGLVERTEX2HNVPROC glVertex2hNV; -extern PFNGLVERTEX2HVNVPROC glVertex2hvNV; -extern PFNGLVERTEX3HNVPROC glVertex3hNV; -extern PFNGLVERTEX3HVNVPROC glVertex3hvNV; -extern PFNGLVERTEX4HNVPROC glVertex4hNV; -extern PFNGLVERTEX4HVNVPROC glVertex4hvNV; -extern PFNGLNORMAL3HNVPROC glNormal3hNV; -extern PFNGLNORMAL3HVNVPROC glNormal3hvNV; -extern PFNGLCOLOR3HNVPROC glColor3hNV; -extern PFNGLCOLOR3HVNVPROC glColor3hvNV; -extern PFNGLCOLOR4HNVPROC glColor4hNV; -extern PFNGLCOLOR4HVNVPROC glColor4hvNV; -extern PFNGLTEXCOORD1HNVPROC glTexCoord1hNV; -extern PFNGLTEXCOORD1HVNVPROC glTexCoord1hvNV; -extern PFNGLTEXCOORD2HNVPROC glTexCoord2hNV; -extern PFNGLTEXCOORD2HVNVPROC glTexCoord2hvNV; -extern PFNGLTEXCOORD3HNVPROC glTexCoord3hNV; -extern PFNGLTEXCOORD3HVNVPROC glTexCoord3hvNV; -extern PFNGLTEXCOORD4HNVPROC glTexCoord4hNV; -extern PFNGLTEXCOORD4HVNVPROC glTexCoord4hvNV; -extern PFNGLMULTITEXCOORD1HNVPROC glMultiTexCoord1hNV; -extern PFNGLMULTITEXCOORD1HVNVPROC glMultiTexCoord1hvNV; -extern PFNGLMULTITEXCOORD2HNVPROC glMultiTexCoord2hNV; -extern PFNGLMULTITEXCOORD2HVNVPROC glMultiTexCoord2hvNV; -extern PFNGLMULTITEXCOORD3HNVPROC glMultiTexCoord3hNV; -extern PFNGLMULTITEXCOORD3HVNVPROC glMultiTexCoord3hvNV; -extern PFNGLMULTITEXCOORD4HNVPROC glMultiTexCoord4hNV; -extern PFNGLMULTITEXCOORD4HVNVPROC glMultiTexCoord4hvNV; -extern PFNGLFOGCOORDHNVPROC glFogCoordhNV; -extern PFNGLFOGCOORDHVNVPROC glFogCoordhvNV; -extern PFNGLSECONDARYCOLOR3HNVPROC glSecondaryColor3hNV; -extern PFNGLSECONDARYCOLOR3HVNVPROC glSecondaryColor3hvNV; -extern PFNGLVERTEXWEIGHTHNVPROC glVertexWeighthNV; -extern PFNGLVERTEXWEIGHTHVNVPROC glVertexWeighthvNV; -extern PFNGLVERTEXATTRIB1HNVPROC glVertexAttrib1hNV; -extern PFNGLVERTEXATTRIB1HVNVPROC glVertexAttrib1hvNV; -extern PFNGLVERTEXATTRIB2HNVPROC glVertexAttrib2hNV; -extern PFNGLVERTEXATTRIB2HVNVPROC glVertexAttrib2hvNV; -extern PFNGLVERTEXATTRIB3HNVPROC glVertexAttrib3hNV; -extern PFNGLVERTEXATTRIB3HVNVPROC glVertexAttrib3hvNV; -extern PFNGLVERTEXATTRIB4HNVPROC glVertexAttrib4hNV; -extern PFNGLVERTEXATTRIB4HVNVPROC glVertexAttrib4hvNV; -extern PFNGLVERTEXATTRIBS1HVNVPROC glVertexAttribs1hvNV; -extern PFNGLVERTEXATTRIBS2HVNVPROC glVertexAttribs2hvNV; -extern PFNGLVERTEXATTRIBS3HVNVPROC glVertexAttribs3hvNV; -extern PFNGLVERTEXATTRIBS4HVNVPROC glVertexAttribs4hvNV; +extern GLEW_EXPORT PFNGLVERTEX2HNVPROC glVertex2hNV; +extern GLEW_EXPORT PFNGLVERTEX2HVNVPROC glVertex2hvNV; +extern GLEW_EXPORT PFNGLVERTEX3HNVPROC glVertex3hNV; +extern GLEW_EXPORT PFNGLVERTEX3HVNVPROC glVertex3hvNV; +extern GLEW_EXPORT PFNGLVERTEX4HNVPROC glVertex4hNV; +extern GLEW_EXPORT PFNGLVERTEX4HVNVPROC glVertex4hvNV; +extern GLEW_EXPORT PFNGLNORMAL3HNVPROC glNormal3hNV; +extern GLEW_EXPORT PFNGLNORMAL3HVNVPROC glNormal3hvNV; +extern GLEW_EXPORT PFNGLCOLOR3HNVPROC glColor3hNV; +extern GLEW_EXPORT PFNGLCOLOR3HVNVPROC glColor3hvNV; +extern GLEW_EXPORT PFNGLCOLOR4HNVPROC glColor4hNV; +extern GLEW_EXPORT PFNGLCOLOR4HVNVPROC glColor4hvNV; +extern GLEW_EXPORT PFNGLTEXCOORD1HNVPROC glTexCoord1hNV; +extern GLEW_EXPORT PFNGLTEXCOORD1HVNVPROC glTexCoord1hvNV; +extern GLEW_EXPORT PFNGLTEXCOORD2HNVPROC glTexCoord2hNV; +extern GLEW_EXPORT PFNGLTEXCOORD2HVNVPROC glTexCoord2hvNV; +extern GLEW_EXPORT PFNGLTEXCOORD3HNVPROC glTexCoord3hNV; +extern GLEW_EXPORT PFNGLTEXCOORD3HVNVPROC glTexCoord3hvNV; +extern GLEW_EXPORT PFNGLTEXCOORD4HNVPROC glTexCoord4hNV; +extern GLEW_EXPORT PFNGLTEXCOORD4HVNVPROC glTexCoord4hvNV; +extern GLEW_EXPORT PFNGLMULTITEXCOORD1HNVPROC glMultiTexCoord1hNV; +extern GLEW_EXPORT PFNGLMULTITEXCOORD1HVNVPROC glMultiTexCoord1hvNV; +extern GLEW_EXPORT PFNGLMULTITEXCOORD2HNVPROC glMultiTexCoord2hNV; +extern GLEW_EXPORT PFNGLMULTITEXCOORD2HVNVPROC glMultiTexCoord2hvNV; +extern GLEW_EXPORT PFNGLMULTITEXCOORD3HNVPROC glMultiTexCoord3hNV; +extern GLEW_EXPORT PFNGLMULTITEXCOORD3HVNVPROC glMultiTexCoord3hvNV; +extern GLEW_EXPORT PFNGLMULTITEXCOORD4HNVPROC glMultiTexCoord4hNV; +extern GLEW_EXPORT PFNGLMULTITEXCOORD4HVNVPROC glMultiTexCoord4hvNV; +extern GLEW_EXPORT PFNGLFOGCOORDHNVPROC glFogCoordhNV; +extern GLEW_EXPORT PFNGLFOGCOORDHVNVPROC glFogCoordhvNV; +extern GLEW_EXPORT PFNGLSECONDARYCOLOR3HNVPROC glSecondaryColor3hNV; +extern GLEW_EXPORT PFNGLSECONDARYCOLOR3HVNVPROC glSecondaryColor3hvNV; +extern GLEW_EXPORT PFNGLVERTEXWEIGHTHNVPROC glVertexWeighthNV; +extern GLEW_EXPORT PFNGLVERTEXWEIGHTHVNVPROC glVertexWeighthvNV; +extern GLEW_EXPORT PFNGLVERTEXATTRIB1HNVPROC glVertexAttrib1hNV; +extern GLEW_EXPORT PFNGLVERTEXATTRIB1HVNVPROC glVertexAttrib1hvNV; +extern GLEW_EXPORT PFNGLVERTEXATTRIB2HNVPROC glVertexAttrib2hNV; +extern GLEW_EXPORT PFNGLVERTEXATTRIB2HVNVPROC glVertexAttrib2hvNV; +extern GLEW_EXPORT PFNGLVERTEXATTRIB3HNVPROC glVertexAttrib3hNV; +extern GLEW_EXPORT PFNGLVERTEXATTRIB3HVNVPROC glVertexAttrib3hvNV; +extern GLEW_EXPORT PFNGLVERTEXATTRIB4HNVPROC glVertexAttrib4hNV; +extern GLEW_EXPORT PFNGLVERTEXATTRIB4HVNVPROC glVertexAttrib4hvNV; +extern GLEW_EXPORT PFNGLVERTEXATTRIBS1HVNVPROC glVertexAttribs1hvNV; +extern GLEW_EXPORT PFNGLVERTEXATTRIBS2HVNVPROC glVertexAttribs2hvNV; +extern GLEW_EXPORT PFNGLVERTEXATTRIBS3HVNVPROC glVertexAttribs3hvNV; +extern GLEW_EXPORT PFNGLVERTEXATTRIBS4HVNVPROC glVertexAttribs4hvNV; #endif /* GL_NV_half_float */ diff --git a/src/wglinfo.c b/src/wglinfo.c index 03ace2a..5d391b2 100644 --- a/src/wglinfo.c +++ b/src/wglinfo.c @@ -48,7 +48,7 @@ int pixelformatok = 0; int dontcreatecontext = 0; int displaystdout = 0; int verbose = 0; -FILE* file = stdout; +FILE* file = 0; void VisualInfoARB (HDC hDC, int verbose)