|
 |
7c0b58 |
diff -up glew-1.9.0/config/Makefile.linux.jx glew-1.9.0/config/Makefile.linux
|
|
|
7c0b58 |
--- glew-1.9.0/config/Makefile.linux.jx 2012-08-06 11:59:08.000000000 -0400
|
|
|
7c0b58 |
+++ glew-1.9.0/config/Makefile.linux 2012-12-13 13:03:05.044983152 -0500
|
|
|
7c0b58 |
@@ -3,14 +3,8 @@ CC = cc
|
|
|
7c0b58 |
LD = cc
|
|
|
7c0b58 |
PICFLAG = -fPIC
|
|
|
7c0b58 |
M_ARCH ?= $(shell uname -m)
|
|
|
7c0b58 |
-ifeq (x86_64,${M_ARCH})
|
|
|
7c0b58 |
-LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64
|
|
|
7c0b58 |
-LIBDIR = $(GLEW_DEST)/lib64
|
|
|
7c0b58 |
-else
|
|
|
7c0b58 |
-LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
|
|
|
7c0b58 |
-LIBDIR = $(GLEW_DEST)/lib
|
|
|
7c0b58 |
-endif
|
|
|
7c0b58 |
-LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
|
|
|
7c0b58 |
+LIBDIR = $(GLEW_DEST)$(libdir)
|
|
|
7c0b58 |
+LDFLAGS.GL = -lGLU -lGL -lX11
|
|
|
7c0b58 |
LDFLAGS.STATIC = -Wl,-Bstatic
|
|
|
7c0b58 |
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
|
|
7c0b58 |
NAME = GLEW
|
|
|
7c0b58 |
diff -up glew-1.9.0/Makefile.jx glew-1.9.0/Makefile
|
|
|
7c0b58 |
--- glew-1.9.0/Makefile.jx 2012-12-13 13:00:59.000000000 -0500
|
|
|
7c0b58 |
+++ glew-1.9.0/Makefile 2012-12-13 13:04:58.027629027 -0500
|
|
|
7c0b58 |
@@ -41,9 +41,9 @@ $(error "Platform '$(SYSTEM)' not suppor
|
|
|
7c0b58 |
endif
|
|
|
7c0b58 |
|
|
|
7c0b58 |
GLEW_DEST ?= /usr
|
|
|
7c0b58 |
-BINDIR ?= $(GLEW_DEST)/bin
|
|
|
7c0b58 |
-LIBDIR ?= $(GLEW_DEST)/lib
|
|
|
7c0b58 |
-INCDIR ?= $(GLEW_DEST)/include/GL
|
|
|
7c0b58 |
+BINDIR ?= $(GLEW_DEST)$(bindir)
|
|
|
7c0b58 |
+LIBDIR ?= $(GLEW_DEST)$(libdir)
|
|
|
7c0b58 |
+INCDIR ?= $(GLEW_DEST)$(includedir)/GL
|
|
|
7c0b58 |
|
|
|
7c0b58 |
TARDIR = ../glew-$(GLEW_VERSION)
|
|
|
7c0b58 |
TARBALL = ../glew-$(GLEW_VERSION).tar.gz
|
|
|
7c0b58 |
@@ -224,7 +224,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
|
|
|
7c0b58 |
$(INSTALL) -d -m 0755 $(BINDIR)
|
|
|
7c0b58 |
$(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/
|
|
|
7c0b58 |
else
|
|
|
7c0b58 |
- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
|
|
|
7c0b58 |
+ $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(LIBDIR)/
|
|
|
7c0b58 |
endif
|
|
|
7c0b58 |
ifneq ($(LN),)
|
|
|
7c0b58 |
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
|
|
|
7c0b58 |
@@ -246,7 +246,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
|
|
|
7c0b58 |
$(INSTALL) -d -m 0755 $(BINDIR)
|
|
|
7c0b58 |
$(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/
|
|
|
7c0b58 |
else
|
|
|
7c0b58 |
- $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/
|
|
|
7c0b58 |
+ $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(LIBDIR)/
|
|
|
7c0b58 |
endif
|
|
|
7c0b58 |
ifneq ($(LN),)
|
|
|
7c0b58 |
$(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX)
|