glew 1.10
This commit is contained in:
parent
70089b8487
commit
100c2dbdb3
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,3 +5,4 @@ glew-1.5.4.tgz
|
|||||||
/glew-1.6.0.tgz
|
/glew-1.6.0.tgz
|
||||||
/glew-1.7.0.tgz
|
/glew-1.7.0.tgz
|
||||||
/glew-1.9.0.tgz
|
/glew-1.9.0.tgz
|
||||||
|
/glew-1.10.0.tgz
|
||||||
|
@ -1,26 +1,6 @@
|
|||||||
diff -up glew-1.9.0/config/Makefile.linux.jx glew-1.9.0/config/Makefile.linux
|
diff -up glew-1.10.0/Makefile.make glew-1.10.0/Makefile
|
||||||
--- glew-1.9.0/config/Makefile.linux.jx 2012-08-06 11:59:08.000000000 -0400
|
--- glew-1.10.0/Makefile.make 2013-07-23 00:11:22.000000000 +1000
|
||||||
+++ glew-1.9.0/config/Makefile.linux 2012-12-13 13:03:05.044983152 -0500
|
+++ glew-1.10.0/Makefile 2013-11-17 17:07:03.308895478 +1000
|
||||||
@@ -3,14 +3,8 @@ CC = cc
|
|
||||||
LD = cc
|
|
||||||
PICFLAG = -fPIC
|
|
||||||
M_ARCH ?= $(shell uname -m)
|
|
||||||
-ifeq (x86_64,${M_ARCH})
|
|
||||||
-LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64
|
|
||||||
-LIBDIR = $(GLEW_DEST)/lib64
|
|
||||||
-else
|
|
||||||
-LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
|
|
||||||
-LIBDIR = $(GLEW_DEST)/lib
|
|
||||||
-endif
|
|
||||||
-LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
|
|
||||||
+LIBDIR = $(GLEW_DEST)$(libdir)
|
|
||||||
+LDFLAGS.GL = -lGLU -lGL -lX11
|
|
||||||
LDFLAGS.STATIC = -Wl,-Bstatic
|
|
||||||
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
|
||||||
NAME = GLEW
|
|
||||||
diff -up glew-1.9.0/Makefile.jx glew-1.9.0/Makefile
|
|
||||||
--- glew-1.9.0/Makefile.jx 2012-12-13 13:00:59.000000000 -0500
|
|
||||||
+++ glew-1.9.0/Makefile 2012-12-13 13:04:58.027629027 -0500
|
|
||||||
@@ -41,9 +41,9 @@ $(error "Platform '$(SYSTEM)' not suppor
|
@@ -41,9 +41,9 @@ $(error "Platform '$(SYSTEM)' not suppor
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -32,9 +12,9 @@ diff -up glew-1.9.0/Makefile.jx glew-1.9.0/Makefile
|
|||||||
+LIBDIR ?= $(GLEW_DEST)$(libdir)
|
+LIBDIR ?= $(GLEW_DEST)$(libdir)
|
||||||
+INCDIR ?= $(GLEW_DEST)$(includedir)/GL
|
+INCDIR ?= $(GLEW_DEST)$(includedir)/GL
|
||||||
|
|
||||||
TARDIR = ../glew-$(GLEW_VERSION)
|
DIST_NAME ?= glew-$(GLEW_VERSION)
|
||||||
TARBALL = ../glew-$(GLEW_VERSION).tar.gz
|
DIST_SRC_ZIP ?= $(shell pwd)/$(DIST_NAME).zip
|
||||||
@@ -224,7 +224,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
|
@@ -237,7 +237,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
|
||||||
$(INSTALL) -d -m 0755 $(BINDIR)
|
$(INSTALL) -d -m 0755 $(BINDIR)
|
||||||
$(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/
|
$(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/
|
||||||
else
|
else
|
||||||
@ -43,7 +23,7 @@ diff -up glew-1.9.0/Makefile.jx glew-1.9.0/Makefile
|
|||||||
endif
|
endif
|
||||||
ifneq ($(LN),)
|
ifneq ($(LN),)
|
||||||
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
|
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
|
||||||
@@ -246,7 +246,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
|
@@ -259,7 +259,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
|
||||||
$(INSTALL) -d -m 0755 $(BINDIR)
|
$(INSTALL) -d -m 0755 $(BINDIR)
|
||||||
$(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/
|
$(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/
|
||||||
else
|
else
|
||||||
@ -52,3 +32,23 @@ diff -up glew-1.9.0/Makefile.jx glew-1.9.0/Makefile
|
|||||||
endif
|
endif
|
||||||
ifneq ($(LN),)
|
ifneq ($(LN),)
|
||||||
$(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX)
|
$(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX)
|
||||||
|
diff -up glew-1.10.0/config/Makefile.linux.make glew-1.10.0/config/Makefile.linux
|
||||||
|
--- glew-1.10.0/config/Makefile.linux.make 2013-11-17 17:07:03.307895450 +1000
|
||||||
|
+++ glew-1.10.0/config/Makefile.linux 2013-11-17 17:08:27.188267881 +1000
|
||||||
|
@@ -9,14 +9,8 @@ endif
|
||||||
|
ifeq (ppc64,${M_ARCH})
|
||||||
|
ARCH64 = true
|
||||||
|
endif
|
||||||
|
-ifeq (${ARCH64},true)
|
||||||
|
- LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64
|
||||||
|
- LIBDIR = $(GLEW_DEST)/lib64
|
||||||
|
-else
|
||||||
|
- LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
|
||||||
|
- LIBDIR = $(GLEW_DEST)/lib
|
||||||
|
-endif
|
||||||
|
-LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
|
||||||
|
+LIBDIR = $(GLEW_DEST)$(libdir)
|
||||||
|
+LDFLAGS.GL = -lGLU -lGL -lX11
|
||||||
|
LDFLAGS.STATIC = -Wl,-Bstatic
|
||||||
|
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
||||||
|
NAME = GLEW
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Name: glew
|
Name: glew
|
||||||
Version: 1.9.0
|
Version: 1.10.0
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: The OpenGL Extension Wrangler Library
|
Summary: The OpenGL Extension Wrangler Library
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: BSD and MIT
|
License: BSD and MIT
|
||||||
@ -54,7 +54,7 @@ sed -i -e 's/\r//g' config/config.guess
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS" includedir=%{_includedir} GLEW_DEST= STRIP= libdir=%{_libdir} bindir=%{_bindir}
|
make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS -fPIC" includedir=%{_includedir} GLEW_DEST= STRIP= libdir=%{_libdir} bindir=%{_bindir}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
Loading…
Reference in New Issue
Block a user