From d8b0c566456d193c893e41e2b0d01e1cac0c0e13 Mon Sep 17 00:00:00 2001 From: ikits Date: Mon, 5 Jan 2004 23:09:21 +0000 Subject: [PATCH] OSX bug fixes git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@187 783a27ee-832a-0410-bc00-9f386506c6dd --- Makefile | 2 +- auto/src/glew_pre.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f7ad93c..7145b01 100644 --- a/Makefile +++ b/Makefile @@ -114,7 +114,7 @@ NAME = GLEW CC = cc LD = cc CFLAGS.EXTRA = -no-cpp-precomp -dynamic -I/usr/X11R6/include -LDFLAGS.SO = -dynamiclib +LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) LDFLAGS.EXTRA = -L/usr/X11R6/lib ifneq (undefined, $(origin GLEW_APPLE_GLX)) CFLAGS.EXTRA += -D'GLEW_APPLE_GLX' diff --git a/auto/src/glew_pre.h b/auto/src/glew_pre.h index 40b273a..f659b54 100644 --- a/auto/src/glew_pre.h +++ b/auto/src/glew_pre.h @@ -1089,11 +1089,15 @@ GLAPI void GLAPIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, GLAPI void GLAPIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); GLEWAPI GLboolean GLEW_VERSION_1_1; -#define glew_VERSION_1_1 GLEW_VERSION_1_1 #endif /* GL_VERSION_1_1 */ /* ------------------------------------------------------------------------- */ /* this is where we can safely include GLU */ +#if defined(__APPLE__) && defined(__MACH__) +#include +#else #include +#endif +