From ac8d4860a968b0710f0d46c0f612617f39c6fe3f Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 10 Oct 2015 10:36:31 +1000 Subject: [PATCH] Simplify Makefile.linux-osmesa --- config/Makefile.linux-osmesa | 38 +++--------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/config/Makefile.linux-osmesa b/config/Makefile.linux-osmesa index c8d1e95..8818665 100644 --- a/config/Makefile.linux-osmesa +++ b/config/Makefile.linux-osmesa @@ -1,36 +1,4 @@ -NAME = $(GLEW_NAME) -CC = cc -LD = cc -M_ARCH ?= $(shell uname -m) -ARCH64 = false -ifeq (x86_64,${M_ARCH}) - ARCH64 = true -endif -ifeq (ppc64,${M_ARCH}) - ARCH64 = true -endif -ifeq (${ARCH64},true) - LDFLAGS.EXTRA = -L/usr/lib64 - LIBDIR = $(GLEW_DEST)/lib64 -else - LDFLAGS.EXTRA = -L/usr/lib - LIBDIR = $(GLEW_DEST)/lib -endif +include Makefile.linux + LDFLAGS.GL = -lOSMesa -LDFLAGS.STATIC = -Wl,-Bstatic -LDFLAGS.DYNAMIC = -Wl,-Bdynamic -NAME = GLEW -WARN = -Wall -W -POPT = -O2 -CFLAGS.EXTRA += -fPIC -DGLEW_OSMESA -BIN.SUFFIX = -LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) -LIB.DEVLNK = lib$(NAME).so -LIB.SHARED = lib$(NAME).so.$(SO_VERSION) -LIB.STATIC = lib$(NAME).a -LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) -LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -LIB.DEVLNK.MX = lib$(NAME)mx.so -LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -LIB.STATIC.MX = lib$(NAME)mx.a -LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX) +CFLAGS.EXTRA += -DGLEW_OSMESA