|
 |
5b2a6e |
diff -up glew-1.10.0/Makefile.make glew-1.10.0/Makefile
|
|
|
5b2a6e |
--- glew-1.10.0/Makefile.make 2013-11-17 18:29:37.553236393 +1000
|
|
|
5b2a6e |
+++ glew-1.10.0/Makefile 2013-11-17 18:30:30.063700846 +1000
|
|
|
ecc9e8 |
@@ -41,9 +41,9 @@ $(error "Platform '$(SYSTEM)' not suppor
|
|
|
ecc9e8 |
endif
|
|
|
ecc9e8 |
|
|
|
ecc9e8 |
GLEW_DEST ?= /usr
|
|
|
ecc9e8 |
-BINDIR ?= $(GLEW_DEST)/bin
|
|
|
ecc9e8 |
-LIBDIR ?= $(GLEW_DEST)/lib
|
|
|
ecc9e8 |
-INCDIR ?= $(GLEW_DEST)/include/GL
|
|
|
ecc9e8 |
+BINDIR ?= $(GLEW_DEST)$(bindir)
|
|
|
ecc9e8 |
+LIBDIR ?= $(GLEW_DEST)$(libdir)
|
|
|
ecc9e8 |
+INCDIR ?= $(GLEW_DEST)$(includedir)/GL
|
|
|
ecc9e8 |
|
|
|
5b2a6e |
DIST_NAME ?= glew-$(GLEW_VERSION)
|
|
|
5b2a6e |
DIST_SRC_ZIP ?= $(shell pwd)/$(DIST_NAME).zip
|
|
|
5b2a6e |
@@ -237,7 +237,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
|
|
|
5b2a6e |
$(INSTALL) -d -m 0755 "$(DESTDIR)$(BINDIR)"
|
|
|
5b2a6e |
$(INSTALL) -m 0755 lib/$(LIB.SHARED) "$(DESTDIR)$(BINDIR)/"
|
|
|
ecc9e8 |
else
|
|
|
5b2a6e |
- $(INSTALL) -m 0644 lib/$(LIB.SHARED) "$(DESTDIR)$(LIBDIR)/"
|
|
|
5b2a6e |
+ $(INSTALL) -m 0755 lib/$(LIB.SHARED) "$(DESTDIR)$(LIBDIR)/"
|
|
|
ecc9e8 |
endif
|
|
|
ecc9e8 |
ifneq ($(LN),)
|
|
|
5b2a6e |
$(LN) $(LIB.SHARED) "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME)"
|
|
|
5b2a6e |
@@ -259,7 +259,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
|
|
|
5b2a6e |
$(INSTALL) -d -m 0755 "$(DESTDIR)$(BINDIR)"
|
|
|
5b2a6e |
$(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) "$(DESTDIR)$(BINDIR)/"
|
|
|
ecc9e8 |
else
|
|
|
5b2a6e |
- $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/"
|
|
|
5b2a6e |
+ $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/"
|
|
|
ecc9e8 |
endif
|
|
|
ecc9e8 |
ifneq ($(LN),)
|
|
|
5b2a6e |
$(LN) $(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX)"
|
|
|
5b2a6e |
diff -up glew-1.10.0/config/Makefile.linux.make glew-1.10.0/config/Makefile.linux
|
|
|
5b2a6e |
--- glew-1.10.0/config/Makefile.linux.make 2013-07-23 00:11:22.000000000 +1000
|
|
|
5b2a6e |
+++ glew-1.10.0/config/Makefile.linux 2013-11-17 18:29:37.557236505 +1000
|
|
|
5b2a6e |
@@ -9,14 +9,8 @@ endif
|
|
|
5b2a6e |
ifeq (ppc64,${M_ARCH})
|
|
|
5b2a6e |
ARCH64 = true
|
|
|
5b2a6e |
endif
|
|
|
5b2a6e |
-ifeq (${ARCH64},true)
|
|
|
5b2a6e |
- LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64
|
|
|
5b2a6e |
- LIBDIR = $(GLEW_DEST)/lib64
|
|
|
5b2a6e |
-else
|
|
|
5b2a6e |
- LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
|
|
|
5b2a6e |
- LIBDIR = $(GLEW_DEST)/lib
|
|
|
5b2a6e |
-endif
|
|
|
5b2a6e |
-LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
|
|
|
5b2a6e |
+LIBDIR = $(GLEW_DEST)$(libdir)
|
|
|
5b2a6e |
+LDFLAGS.GL = -lGLU -lGL -lX11
|
|
|
5b2a6e |
LDFLAGS.STATIC = -Wl,-Bstatic
|
|
|
5b2a6e |
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
|
|
5b2a6e |
NAME = GLEW
|