Zengtudor/glew-cmake
1
0
Fork 0
mirror of https://github.com/Perlmint/glew-cmake.git synced 2024-11-30 02:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source 
git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@508 783a27ee-832a-0410-bc00-9f386506c6dd
This commit is contained in:
ikits 2007-09-28 19:07:02 +00:00
parent 0d18f7f948
commit b6ef9dd3ad
4 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -50,14 +50,13 @@ TARBALL = ../glew_$(GLEW_VERSION).tar.gz
AR = ar AR = ar
INSTALL = install INSTALL = install
STRIP = strip
RM = rm -f RM = rm -f
LN = ln -sf LN = ln -sf
ifeq ($(MAKECMDGOALS), debug) ifeq ($(MAKECMDGOALS), debug)
OPT = -g OPT = -g
STRIP =
else else
OPT = $(POPT) OPT = $(POPT)
STRIP = -s
endif endif
INCLUDE = -Iinclude INCLUDE = -Iinclude
CFLAGS = $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA) CFLAGS = $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA)
@ -114,15 +113,12 @@ install: all
$(INSTALL) -d -m 0755 $(LIBDIR) $(INSTALL) -d -m 0755 $(LIBDIR)
# runtime # runtime
ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw) ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/ $(STRIP) -x lib/$(LIB.SHARED)
$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
else else
ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin) $(STRIP) -x lib/$(LIB.SHARED)
strip -x lib/$(LIB.SHARED)
$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
else
$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
endif endif
endif endif
# development files # development files
@ -132,14 +128,9 @@ endif
ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw) ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
else else
ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin)
strip -x lib/$(LIB.STATIC) strip -x lib/$(LIB.STATIC)
$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
else
$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
endif
endif endif
# utilities # utilities
$(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/ $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/

2
auto/bin/make.pl
View File

@ -10,7 +10,7 @@ my %regex = (
extname => qr/^[A-Z][A-Za-z0-9_]+$/, extname => qr/^[A-Z][A-Za-z0-9_]+$/,
exturl => qr/^http.+$/, exturl => qr/^http.+$/,
function => qr/^(.+) ([a-z][a-z0-9_]*) \((.+)\)$/i, function => qr/^(.+) ([a-z][a-z0-9_]*) \((.+)\)$/i,
token => qr/^([A-Z][A-Z0-9_]*)\s+((?:0x)?[0-9A-F]+|[A-Z][A-Z0-9_]*)$/, token => qr/^([A-Z][A-Z0-9_x]*)\s+((?:0x)?[0-9A-F]+|[A-Z][A-Z0-9_]*)$/,
type => qr/^typedef\s+(.+)\s+([\*A-Za-z0-9_]+)$/, type => qr/^typedef\s+(.+)\s+([\*A-Za-z0-9_]+)$/,
exact => qr/.*;$/, exact => qr/.*;$/,
); );

11
auto/bin/update_ext.sh
View File

@ -66,6 +66,17 @@ EOT
GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
EOT EOT
# fix WGL_ARB_make_current_read
cat >> $1/WGL_ARB_make_current_read <<EOT
ERROR_INVALID_PIXEL_TYPE_ARB 0x2043
ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
EOT
# fix WGL_EXT_make_current_read
cat >> $1/WGL_EXT_make_current_read <<EOT
ERROR_INVALID_PIXEL_TYPE_EXT 0x2043
EOT
# add typedefs to GL_ARB_vertex_buffer_object; (from personal communication # add typedefs to GL_ARB_vertex_buffer_object; (from personal communication
# with Marco Fabbricatore). # with Marco Fabbricatore).
# #

7
auto/src/glew_head.h
View File

@ -165,15 +165,10 @@ typedef float GLclampf;
typedef double GLdouble; typedef double GLdouble;
typedef double GLclampd; typedef double GLclampd;
typedef void GLvoid; typedef void GLvoid;
#if defined(_MSC_VER) && _MSC_VER < 1310 #if defined(_MSC_VER) && _MSC_VER < 1400
# ifdef _WIN64
typedef __int64 GLint64EXT; typedef __int64 GLint64EXT;
typedef unsigned __int64 GLuint64EXT; typedef unsigned __int64 GLuint64EXT;
#else #else
typedef _W64 int GLint64EXT;
typedef _W64 unsigned int GLuint64EXT;
# endif
#else
typedef signed long long GLint64EXT; typedef signed long long GLint64EXT;
typedef unsigned long long GLuint64EXT; typedef unsigned long long GLuint64EXT;
#endif #endif