*** empty log message ***

git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@263 783a27ee-832a-0410-bc00-9f386506c6dd
This commit is contained in:
ikits 2004-05-09 09:36:16 +00:00
parent ef12b6f7a2
commit bcdc9df17f
4 changed files with 19 additions and 6 deletions

View File

@ -49,6 +49,9 @@ NAME = glew32
CC = gcc -mno-cygwin CC = gcc -mno-cygwin
LD = ld LD = ld
CFLAGS.EXTRA = -DGLEW_STATIC CFLAGS.EXTRA = -DGLEW_STATIC
ifneq (undefined, $(origin GLEW_MX))
CFLAGS.EXTRA += -DGLEW_MX
endif
LDFLAGS.SO = -shared -soname $(LIB.SONAME) LDFLAGS.SO = -shared -soname $(LIB.SONAME)
LDFLAGS.GL = -lglu32 -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.GL = -lglu32 -lopengl32 -lgdi32 -luser32 -lkernel32
LDFLAGS.EXTRA = LDFLAGS.EXTRA =
@ -69,7 +72,9 @@ NAME = glew32
CC = gcc CC = gcc
# use gcc for linking, with ld it does not work # use gcc for linking, with ld it does not work
LD = gcc LD = gcc
CFLAGS.EXTRA = ifneq (undefined, $(origin GLEW_MX))
CFLAGS.EXTRA = -DGLEW_MX
endif
CFLAGS.SO = -DGLEW_BUILD CFLAGS.SO = -DGLEW_BUILD
#LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK) #LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK)
LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK) LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)
@ -119,7 +124,9 @@ LD = ld
ABI = -64# -n32 ABI = -64# -n32
CC += $(ABI) CC += $(ABI)
LD += $(ABI) LD += $(ABI)
CFLAGS.EXTRA = ifneq (undefined, $(origin GLEW_MX))
CFLAGS.EXTRA = -DGLEW_MX
endif
LDFLAGS.SO = -shared -soname $(LIB.SONAME) LDFLAGS.SO = -shared -soname $(LIB.SONAME)
LDFLAGS.EXTRA = LDFLAGS.EXTRA =
LDFLAGS.GL = -lGL -lXext -lX11 LDFLAGS.GL = -lGL -lXext -lX11
@ -141,6 +148,9 @@ NAME = GLEW
CC = cc CC = cc
LD = cc LD = cc
CFLAGS.EXTRA = -no-cpp-precomp -dynamic -fno-common CFLAGS.EXTRA = -no-cpp-precomp -dynamic -fno-common
ifneq (undefined, $(origin GLEW_MX))
CFLAGS.EXTRA += -DGLEW_MX
endif
LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED)
LDFLAGS.EXTRA = LDFLAGS.EXTRA =
ifneq (undefined, $(origin GLEW_APPLE_GLX)) ifneq (undefined, $(origin GLEW_APPLE_GLX))
@ -167,6 +177,9 @@ NAME = GLEW
CC = cc CC = cc
LD = ld LD = ld
CFLAGS.EXTRA = -I/usr/openwin/include CFLAGS.EXTRA = -I/usr/openwin/include
ifneq (undefined, $(origin GLEW_MX))
CFLAGS.EXTRA += -DGLEW_MX
endif
LDFLAGS.SO = -G LDFLAGS.SO = -G
LDFLAGS.EXTRA = -L/usr/openwin/lib LDFLAGS.EXTRA = -L/usr/openwin/lib
LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11

View File

@ -44,7 +44,7 @@ int main (void)
err = glewContextInit(glewGetContext()); err = glewContextInit(glewGetContext());
#ifdef _WIN32 #ifdef _WIN32
err = err || wglewContextInit(wglewGetContext()); err = err || wglewContextInit(wglewGetContext());
#else #elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
err = err || glxewContextInit(glxewGetContext()); err = err || glxewContextInit(glxewGetContext());
#endif #endif

View File

@ -47,7 +47,7 @@ GLEWContext _glewctx;
#ifdef _WIN32 #ifdef _WIN32
WGLEWContext _wglewctx; WGLEWContext _wglewctx;
#define wglewGetContext() (&_wglewctx) #define wglewGetContext() (&_wglewctx)
#else #elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
GLXEWContext _glxewctx; GLXEWContext _glxewctx;
#define glxewGetContext() (&_glxewctx) #define glxewGetContext() (&_glxewctx)
#endif #endif

View File

@ -566,8 +566,8 @@ generation scripts are released under the <a href="gpl.txt">GPL</a>.
<li><b>1.2.2</b> [05-08-04] <li><b>1.2.2</b> [05-08-04]
<ul> <ul>
<li> Added GL_EXT_pixel_buffer_object, removed GL_NV_element_array <li> Added GL_EXT_pixel_buffer_object, removed GL_NV_element_array
<li> Bug fix in GL_EXT_texture_rectangle <li> Fixed GLEW_MX problems
<li> Bug fix in <tt>wglinfo</tt> <li> Bug fix in GL_EXT_texture_rectangle and <tt>wglinfo</tt>
</ul> </ul>
<p> <p>
<li><b>1.2.1</b> [03-18-04] <li><b>1.2.1</b> [03-18-04]