From 7651ef95c322c8e0ba88c83555df23dd86af6b93 Mon Sep 17 00:00:00 2001 From: ikits Date: Thu, 1 May 2003 19:26:03 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@50 783a27ee-832a-0410-bc00-9f386506c6dd --- build/vc6/glew_shared.dsp | 6 +++--- build/vc6/glew_static.dsp | 6 +++--- build/vc6/glewinfo.dsp | 4 ++-- build/vc6/wglinfo.dsp | 4 ++-- include/GL/glew.h | 12 ++++++------ include/GL/wglew.h | 8 ++++---- src/glew.c | 8 ++++---- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/build/vc6/glew_shared.dsp b/build/vc6/glew_shared.dsp index 1c6a055..1d563b3 100644 --- a/build/vc6/glew_shared.dsp +++ b/build/vc6/glew_shared.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLEW_EXPORTS" /YX /FD /c -# ADD CPP /nologo /W3 /O2 /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_DLL" /D "GLEW_BUILD" /YX /FD /c +# ADD CPP /nologo /W3 /O2 /I "../../include" /D "WIN32" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -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 /out:"../../lib/shared/glew32.dll" /ignore:4089 +# ADD LINK32 opengl32.lib /nologo /dll /machine:I386 /def:"glew32.def" /out:"../../lib/shared/glew32.dll" /ignore:4089 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "glew_shared - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLEW_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../../include" /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D "GLEW_BUILD" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" diff --git a/build/vc6/glew_static.dsp b/build/vc6/glew_static.dsp index 75a7ef1..964e56e 100644 --- a/build/vc6/glew_static.dsp +++ b/build/vc6/glew_static.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "static/release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /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 @@ -64,7 +64,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "static/debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /D "GLEW_STATIC" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -72,7 +72,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../../lib/static/glew32.lib" +# ADD LIB32 /nologo /out:"../../lib/static/glew32d.lib" !ENDIF diff --git a/build/vc6/glewinfo.dsp b/build/vc6/glewinfo.dsp index f95e8cb..dfa506d 100644 --- a/build/vc6/glewinfo.dsp +++ b/build/vc6/glewinfo.dsp @@ -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 /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" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -74,7 +74,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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ../../lib/glew32d.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../../bin/glewinfod.exe" /pdbtype:sept +# ADD LINK32 ../../lib/static/glew32d.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../../bin/glewinfod.exe" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/build/vc6/wglinfo.dsp b/build/vc6/wglinfo.dsp index cea5623..000d461 100644 --- a/build/vc6/wglinfo.dsp +++ b/build/vc6/wglinfo.dsp @@ -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 /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" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -74,7 +74,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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 glu32.lib opengl32.lib gdi32.lib user32.lib kernel32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../../bin/wglinfod.exe" /pdbtype:sept +# ADD LINK32 ../../lib/static/glew32d.lib glu32.lib opengl32.lib gdi32.lib user32.lib kernel32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../../bin/wglinfod.exe" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/include/GL/glew.h b/include/GL/glew.h index 26f84e4..4e2dfe6 100644 --- a/include/GL/glew.h +++ b/include/GL/glew.h @@ -122,17 +122,17 @@ typedef unsigned short wchar_t; #endif /* - * GLEW_DLL needs to be set when using the DLL version. + * GLEW_STATIC needs to be set when using the static version. * GLEW_BUILD is set when building the DLL version. */ -#ifdef GLEW_DLL +#ifdef GLEW_STATIC +# define GLEW_EXPORT +#else # ifdef GLEW_BUILD # define GLEW_EXPORT __declspec(dllexport) # else # define GLEW_EXPORT __declspec(dllimport) # endif -#else -# define GLEW_EXPORT #endif #else /* _UNIX */ @@ -2140,8 +2140,8 @@ extern GLEW_EXPORT PFNGLMULTTRANSPOSEMATRIXDARBPROC glMultTransposeMatrixdARB; #define GL_BUFFER_MAPPED_ARB 0x88BC #define GL_BUFFER_MAP_POINTER_ARB 0x88BD -typedef size_t GLsizeiptrARB; -typedef size_t GLintptrARB; +typedef int GLsizeiptrARB; +typedef int GLintptrARB; typedef void (APIENTRY * PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer); typedef void (APIENTRY * PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers); diff --git a/include/GL/wglew.h b/include/GL/wglew.h index ee7a7fd..c5245e5 100644 --- a/include/GL/wglew.h +++ b/include/GL/wglew.h @@ -74,17 +74,17 @@ #endif /* - * GLEW_DLL needs to be set when using the DLL version. + * GLEW_STATIC needs to be set when using the static version. * GLEW_BUILD is set when building the DLL version. */ -#ifdef GLEW_DLL +#ifdef GLEW_STATIC +# define GLEW_EXPORT +#else # ifdef GLEW_BUILD # define GLEW_EXPORT __declspec(dllexport) # else # define GLEW_EXPORT __declspec(dllimport) # endif -#else -# define GLEW_EXPORT #endif #ifdef __cplusplus diff --git a/src/glew.c b/src/glew.c index ed7d062..74aa3af 100644 --- a/src/glew.c +++ b/src/glew.c @@ -2640,28 +2640,28 @@ static GLboolean _glxewInit_SUN_get_transparent_index () * These functions only implement the functionality required in this file. */ -int _glewStrLen (const char *s) +static int _glewStrLen (const char *s) { int i=0; while (s+i != NULL && s[i] != '\0') i++; return i; } -int _glewStrCLen (const char *s, char c) +static int _glewStrCLen (const char *s, char c) { int i=0; while (s+i != NULL && s[i] != '\0' && s[i] != c) i++; return i; } -int _glewStrSame (const char *a, const char *b, int n) +static int _glewStrSame (const char *a, const char *b, int n) { int i=0; while (i < n && a+i != NULL && b+i != NULL && a[i] == b[i]) i++; return i == n; } -void* _glewMemSet (void *s, char c, int n) +static void* _glewMemSet (void *s, char c, int n) { int i; char* d=(char*)s;