Ignore arch for Linux gcc and clang builds

This commit is contained in:
Nigel Stewart 2019-01-28 10:58:35 +10:00
parent cce37477a1
commit 6ecc9b7c3f
2 changed files with 6 additions and 32 deletions

View File

@ -1,24 +1,11 @@
NAME = $(GLEW_NAME) NAME = $(GLEW_NAME)
CC = cc CC = cc
LD = cc LD = cc
M_ARCH ?= $(shell uname -m) LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
ARCH64 = false LIBDIR = $(GLEW_DEST)/lib
ifeq (x86_64,${M_ARCH})
ARCH64 = true
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 = -lGL -lX11 LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic LDFLAGS.DYNAMIC = -Wl,-Bdynamic,-rpath,$(LIBDIR)
NAME = GLEW NAME = GLEW
WARN = -Wall -W WARN = -Wall -W
POPT = -O2 POPT = -O2

View File

@ -1,24 +1,11 @@
NAME = $(GLEW_NAME) NAME = $(GLEW_NAME)
CC = clang CC = clang
LD = clang LD = clang
M_ARCH ?= $(shell uname -m) LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
ARCH64 = false LIBDIR = $(GLEW_DEST)/lib
ifeq (x86_64,${M_ARCH})
ARCH64 = true
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 = -lGL -lX11 LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic LDFLAGS.DYNAMIC = -Wl,-Bdynamic,-rpath,$(LIBDIR)
NAME = GLEW NAME = GLEW
WARN = -Wall -W WARN = -Wall -W
POPT = -O2 POPT = -O2