Commit 08196588 authored by Nigel Stewart's avatar Nigel Stewart
Browse files

Revert "GLEW Patch #63 - Use CC/CXX/LD variable from environment, don't hardcode cc"

TODO - revisit
parent d03b68e4
......@@ -4,8 +4,8 @@ BINDIR = /usr/bin
LIBDIR = /usr/lib/mingw
INCDIR = /usr/include/mingw/GL
# use gcc for linking, with ld it does not work
CC ?= gcc -mno-cygwin
LD ?= $(CC)
CC := gcc -mno-cygwin
LD := gcc -mno-cygwin
LN :=
CFLAGS.SO = -DGLEW_BUILD
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
......
NAME = GLEW
GLEW_DEST ?= /usr
# use gcc for linking, with ld it does not work
CC ?= cc
LD ?= $(CC)
CC := cc
LD := cc
LN :=
LDFLAGS.EXTRA =
LIBDIR = $(GLEW_DEST)/lib
......
NAME = $(GLEW_NAME)
CC ?= cc
LD ?= $(CC)
CC = cc
LD = cc
CFLAGS.EXTRA = -dynamic -fno-common
#CFLAGS.EXTRA += -no-cpp-precomp
LDFLAGS.EXTRA =
......
NAME = $(GLEW_NAME)
CC ?= cc
LD ?= $(CC)
CC = cc
LD = cc
CFLAGS.EXTRA = -arch ppc -dynamic -fno-common
#CFLAGS.EXTRA += -no-cpp-precomp
LDFLAGS.EXTRA = -arch ppc
......
NAME = $(GLEW_NAME)
CC ?= cc
LD ?= $(CC)
CC = cc
LD = cc
CFLAGS.EXTRA = -arch x86_64 -dynamic -fno-common
#CFLAGS.EXTRA += -no-cpp-precomp
LDFLAGS.EXTRA = -arch x86_64
......
NAME = $(GLEW_NAME)
CC ?= cc
LD ?= ld
CC = cc
LD = ld
LDFLAGS.EXTRA = -L/usr/X11R6/lib
LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic
......
NAME = $(GLEW_NAME)
CC ?= cc
LD ?= $(CC)
CC = cc
LD = cc
LDFLAGS.EXTRA = -L/usr/X11R6/lib
LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic
......
NAME = $(GLEW_NAME)
CC ?= cc
LD ?= $(CC)
CC = cc
LD = cc
ifneq (undefined, $(origin GLEW_MX))
CFLAGS.EXTRA = -DGLEW_MX
endif
......
NAME = $(GLEW_NAME)
CC ?= cc
LD ?= ld
CC = cc
LD = ld
ABI = -64# -n32
CC += $(ABI)
LD += $(ABI)
......
NAME = $(GLEW_NAME)
CC ?= cc
LD ?= $(CC)
CC = cc
LD = cc
LDFLAGS.EXTRA = -L/usr/X11R6/lib
LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic
......
NAME = $(GLEW_NAME)
CC ?= cc
LD ?= $(CC)
CC = cc
LD = cc
M_ARCH ?= $(shell uname -m)
ARCH64 = false
ifeq (x86_64,${M_ARCH})
......
NAME = glew32
# use gcc for linking, with ld it does not work
CC ?= gcc
LD ?= $(CC)
CC := gcc
LD := gcc
LN :=
CFLAGS.SO = -DGLEW_BUILD
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
......
......@@ -6,9 +6,9 @@ ifeq (Linux,${M_NAME})
M_PREFIX = i686
endif
CC ?= $(M_PREFIX)-nacl-gcc
CXX ?= $(M_PREFIX)-nacl-g++
LD ?= $(M_PREFIX)-nacl-ld
CC = $(M_PREFIX)-nacl-gcc
CXX = $(M_PREFIX)-nacl-g++
LD = $(M_PREFIX)-nacl-ld
STRIP ?=
EXT.DYNAMIC = so
LDFLAGS.EXTRA =
......
......@@ -6,9 +6,9 @@ ifeq (Linux,${M_NAME})
M_PREFIX = i686
endif
CC ?= $(M_PREFIX)-nacl-gcc
CXX ?= $(M_PREFIX)-nacl-g++
LD ?= $(M_PREFIX)-nacl-ld
CC = $(M_PREFIX)-nacl-gcc
CXX = $(M_PREFIX)-nacl-g++
LD = $(M_PREFIX)-nacl-ld
STRIP ?=
EXT.DYNAMIC = so
LDFLAGS.EXTRA =
......
NAME = $(GLEW_NAME)
CC ?= cc
LD ?= ld
CC = cc
LD = ld
LDFLAGS.EXTRA = -L/usr/X11R7/lib -R /usr/X11R7/lib
LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic
......
NAME = $(GLEW_NAME)
CC ?= cc
LD ?= ld
CC = cc
LD = ld
LDFLAGS.EXTRA = -L/usr/X11R6/lib
LDFLAGS.GL = -lGLU -lGL -lX11 -lm
LDFLAGS.STATIC = -Wl,-Bstatic
......
NAME = $(GLEW_NAME)
CC ?= cc
LD ?= ld
CC = cc
LD = ld
CFLAGS.EXTRA = -I/usr/openwin/include
LDFLAGS.SO = -G
LDFLAGS.EXTRA = -L/usr/openwin/lib
......
NAME = $(GLEW_NAME)
CC ?= gcc
LD ?= ld
CC = gcc
LD = ld
CFLAGS.EXTRA = -I/usr/openwin/include
LDFLAGS.SO = -G
LDFLAGS.EXTRA = -L/usr/openwin/lib
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment