mirror of
https://github.com/nigels-com/glew.git
synced 2024-11-11 08:43:49 +00:00
Changed approach to be slightly more resilient to regression issues
This commit is contained in:
parent
0c9ab41431
commit
69cbc3532f
5
Makefile
5
Makefile
@ -65,6 +65,7 @@ DIST_DIR := $(shell mktemp -d /tmp/glew.XXXXXX)/$(DIST_NAME)
|
|||||||
# - use LN= on gmake command-line
|
# - use LN= on gmake command-line
|
||||||
|
|
||||||
AR ?= ar
|
AR ?= ar
|
||||||
|
ARFLAGS.STATIC ?= cr
|
||||||
INSTALL ?= install
|
INSTALL ?= install
|
||||||
STRIP ?= strip
|
STRIP ?= strip
|
||||||
RM ?= rm -f
|
RM ?= rm -f
|
||||||
@ -104,7 +105,7 @@ lib:
|
|||||||
mkdir lib
|
mkdir lib
|
||||||
|
|
||||||
lib/$(LIB.STATIC): $(LIB.OBJS)
|
lib/$(LIB.STATIC): $(LIB.OBJS)
|
||||||
$(AR) $(LDFLAGS.STATIC) $@ $^
|
$(AR) $(ARFLAGS.STATIC) $@ $^
|
||||||
ifneq ($(STRIP),)
|
ifneq ($(STRIP),)
|
||||||
$(STRIP) -x $@
|
$(STRIP) -x $@
|
||||||
endif
|
endif
|
||||||
@ -148,7 +149,7 @@ glew.pc: glew.pc.in
|
|||||||
glew.lib.mx: lib lib/$(LIB.SHARED.MX) lib/$(LIB.STATIC.MX) glewmx.pc
|
glew.lib.mx: lib lib/$(LIB.SHARED.MX) lib/$(LIB.STATIC.MX) glewmx.pc
|
||||||
|
|
||||||
lib/$(LIB.STATIC.MX): $(LIB.OBJS.MX)
|
lib/$(LIB.STATIC.MX): $(LIB.OBJS.MX)
|
||||||
$(AR) $(LDFLAGS.STATIC) $@ $^
|
$(AR) $(ARFLAGS.STATIC) $@ $^
|
||||||
|
|
||||||
lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX)
|
lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX)
|
||||||
$(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
|
$(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
|
||||||
|
@ -7,7 +7,6 @@ INCDIR = /usr/include/mingw/GL
|
|||||||
CC := gcc -mno-cygwin
|
CC := gcc -mno-cygwin
|
||||||
LD := gcc -mno-cygwin
|
LD := gcc -mno-cygwin
|
||||||
LN :=
|
LN :=
|
||||||
LDFLAGS.STATIC = cr
|
|
||||||
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
||||||
LDFLAGS.EXTRA = -L$(LIBDIR)
|
LDFLAGS.EXTRA = -L$(LIBDIR)
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
|
@ -7,7 +7,7 @@ LN :=
|
|||||||
LDFLAGS.EXTRA =
|
LDFLAGS.EXTRA =
|
||||||
LIBDIR = $(GLEW_DEST)/lib
|
LIBDIR = $(GLEW_DEST)/lib
|
||||||
LDFLAGS.GL = -lGL -lX11
|
LDFLAGS.GL = -lGL -lX11
|
||||||
LDFLAGS.STATIC = cr -Wl,-Bstatic
|
LDFLAGS.STATIC = -Wl,-Bstatic
|
||||||
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
|
@ -10,7 +10,7 @@ LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
|||||||
else
|
else
|
||||||
LDFLAGS.GL = -framework AGL -framework OpenGL
|
LDFLAGS.GL = -framework AGL -framework OpenGL
|
||||||
endif
|
endif
|
||||||
LDFLAGS.STATIC = cr
|
LDFLAGS.STATIC =
|
||||||
LDFLAGS.DYNAMIC =
|
LDFLAGS.DYNAMIC =
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
|
@ -10,7 +10,7 @@ LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
|||||||
else
|
else
|
||||||
LDFLAGS.GL = -framework AGL -framework OpenGL
|
LDFLAGS.GL = -framework AGL -framework OpenGL
|
||||||
endif
|
endif
|
||||||
LDFLAGS.STATIC = cr
|
LDFLAGS.STATIC =
|
||||||
LDFLAGS.DYNAMIC =
|
LDFLAGS.DYNAMIC =
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
|
@ -13,7 +13,7 @@ LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
|||||||
else
|
else
|
||||||
LDFLAGS.GL = -framework AGL -framework OpenGL
|
LDFLAGS.GL = -framework AGL -framework OpenGL
|
||||||
endif
|
endif
|
||||||
LDFLAGS.STATIC = -static -o
|
ARFLAGS.STATIC = -static -o
|
||||||
LDFLAGS.DYNAMIC =
|
LDFLAGS.DYNAMIC =
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
|
@ -10,7 +10,7 @@ LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
|
|||||||
else
|
else
|
||||||
LDFLAGS.GL = -framework AGL -framework OpenGL
|
LDFLAGS.GL = -framework AGL -framework OpenGL
|
||||||
endif
|
endif
|
||||||
LDFLAGS.STATIC = cr
|
LDFLAGS.STATIC =
|
||||||
LDFLAGS.DYNAMIC =
|
LDFLAGS.DYNAMIC =
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
|
@ -3,7 +3,7 @@ CC = cc
|
|||||||
LD = ld
|
LD = ld
|
||||||
LDFLAGS.EXTRA = -L/usr/X11R6/lib
|
LDFLAGS.EXTRA = -L/usr/X11R6/lib
|
||||||
LDFLAGS.GL = -lGL -lX11
|
LDFLAGS.GL = -lGL -lX11
|
||||||
LDFLAGS.STATIC = cr -Wl,-Bstatic
|
LDFLAGS.STATIC = -Wl,-Bstatic
|
||||||
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
||||||
CFLAGS.EXTRA += -I/usr/X11R6/include -fPIC
|
CFLAGS.EXTRA += -I/usr/X11R6/include -fPIC
|
||||||
NAME = GLEW
|
NAME = GLEW
|
||||||
|
@ -3,7 +3,7 @@ CC = cc
|
|||||||
LD = cc
|
LD = cc
|
||||||
LDFLAGS.EXTRA = -L/usr/X11R6/lib
|
LDFLAGS.EXTRA = -L/usr/X11R6/lib
|
||||||
LDFLAGS.GL = -lGL -lX11
|
LDFLAGS.GL = -lGL -lX11
|
||||||
LDFLAGS.STATIC = cr -Wl,-Bstatic
|
LDFLAGS.STATIC = -Wl,-Bstatic
|
||||||
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
||||||
NAME = GLEW
|
NAME = GLEW
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
|
@ -6,7 +6,7 @@ ifneq (undefined, $(origin GLEW_MX))
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
LDFLAGS.GL = -lGL
|
LDFLAGS.GL = -lGL
|
||||||
LDFLAGS.STATIC = cr -Wl,-Bstatic
|
LDFLAGS.STATIC = -Wl,-Bstatic
|
||||||
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
||||||
|
|
||||||
NAME = GLEW
|
NAME = GLEW
|
||||||
|
@ -4,7 +4,6 @@ LD = ld
|
|||||||
ABI = -64# -n32
|
ABI = -64# -n32
|
||||||
CC += $(ABI)
|
CC += $(ABI)
|
||||||
LD += $(ABI)
|
LD += $(ABI)
|
||||||
LDFLAGS.STATIC = cr
|
|
||||||
LDFLAGS.EXTRA =
|
LDFLAGS.EXTRA =
|
||||||
LDFLAGS.GL = -lGL -lXext -lX11
|
LDFLAGS.GL = -lGL -lXext -lX11
|
||||||
NAME = GLEW
|
NAME = GLEW
|
||||||
|
@ -3,7 +3,7 @@ CC = cc
|
|||||||
LD = cc
|
LD = cc
|
||||||
LDFLAGS.EXTRA = -L/usr/X11R6/lib
|
LDFLAGS.EXTRA = -L/usr/X11R6/lib
|
||||||
LDFLAGS.GL = -lGL -lX11
|
LDFLAGS.GL = -lGL -lX11
|
||||||
LDFLAGS.STATIC = cr -Wl,-Bstatic
|
LDFLAGS.STATIC = -Wl,-Bstatic
|
||||||
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
||||||
NAME = GLEW
|
NAME = GLEW
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
|
@ -17,7 +17,7 @@ else
|
|||||||
LIBDIR = $(GLEW_DEST)/lib
|
LIBDIR = $(GLEW_DEST)/lib
|
||||||
endif
|
endif
|
||||||
LDFLAGS.GL = -lGL -lX11
|
LDFLAGS.GL = -lGL -lX11
|
||||||
LDFLAGS.STATIC = cr -Wl,-Bstatic
|
LDFLAGS.STATIC = -Wl,-Bstatic
|
||||||
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
||||||
NAME = GLEW
|
NAME = GLEW
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
|
@ -9,7 +9,6 @@ CC := i686-w64-mingw32-gcc
|
|||||||
LD := i686-w64-mingw32-ld
|
LD := i686-w64-mingw32-ld
|
||||||
LN :=
|
LN :=
|
||||||
STRIP :=
|
STRIP :=
|
||||||
LDFLAGS.STATIC = cr
|
|
||||||
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
|
@ -10,7 +10,6 @@ CC := $(HOST)-gcc
|
|||||||
LD := $(HOST)-ld
|
LD := $(HOST)-ld
|
||||||
LN :=
|
LN :=
|
||||||
STRIP :=
|
STRIP :=
|
||||||
LDFLAGS.STATIC = cr
|
|
||||||
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
|
@ -10,7 +10,6 @@ CC := $(HOST)-gcc
|
|||||||
LD := $(HOST)-ld
|
LD := $(HOST)-ld
|
||||||
LN :=
|
LN :=
|
||||||
STRIP :=
|
STRIP :=
|
||||||
LDFLAGS.STATIC = cr
|
|
||||||
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
|
@ -3,7 +3,6 @@ NAME = glew32
|
|||||||
CC := gcc
|
CC := gcc
|
||||||
LD := gcc
|
LD := gcc
|
||||||
LN :=
|
LN :=
|
||||||
LDFLAGS.STATIC = cr
|
|
||||||
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
||||||
LDFLAGS.EXTRA = -L/mingw/lib
|
LDFLAGS.EXTRA = -L/mingw/lib
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
|
@ -19,7 +19,7 @@ LDFLAGS.EXTRA += -melf_nacl
|
|||||||
LDFLAGS.GL =
|
LDFLAGS.GL =
|
||||||
LDFLAGS.GLU = -lRegalGLU
|
LDFLAGS.GLU = -lRegalGLU
|
||||||
LDFLAGS.GLUT = -lRegalGLUT
|
LDFLAGS.GLUT = -lRegalGLUT
|
||||||
LDFLAGS.STATIC = cr
|
LDFLAGS.STATIC =
|
||||||
LDFLAGS.DYNAMIC = -shared
|
LDFLAGS.DYNAMIC = -shared
|
||||||
WARN = -Wall -W -Wno-unused-parameter
|
WARN = -Wall -W -Wno-unused-parameter
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
|
@ -19,7 +19,7 @@ LDFLAGS.EXTRA += -melf64_nacl
|
|||||||
LDFLAGS.GL =
|
LDFLAGS.GL =
|
||||||
LDFLAGS.GLU = -lRegalGLU
|
LDFLAGS.GLU = -lRegalGLU
|
||||||
LDFLAGS.GLUT = -lRegalGLUT
|
LDFLAGS.GLUT = -lRegalGLUT
|
||||||
LDFLAGS.STATIC = cr
|
LDFLAGS.STATIC =
|
||||||
LDFLAGS.DYNAMIC = -shared
|
LDFLAGS.DYNAMIC = -shared
|
||||||
WARN = -Wall -W -Wno-unused-parameter
|
WARN = -Wall -W -Wno-unused-parameter
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
|
@ -3,7 +3,7 @@ CC = cc
|
|||||||
LD = ld
|
LD = ld
|
||||||
LDFLAGS.EXTRA = -L/usr/X11R7/lib -R /usr/X11R7/lib
|
LDFLAGS.EXTRA = -L/usr/X11R7/lib -R /usr/X11R7/lib
|
||||||
LDFLAGS.GL = -lGL -lX11
|
LDFLAGS.GL = -lGL -lX11
|
||||||
LDFLAGS.STATIC = cr -Wl,-Bstatic
|
LDFLAGS.STATIC = -Wl,-Bstatic
|
||||||
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
||||||
CFLAGS.EXTRA += -I/usr/X11R7/include -fPIC
|
CFLAGS.EXTRA += -I/usr/X11R7/include -fPIC
|
||||||
NAME = GLEW
|
NAME = GLEW
|
||||||
|
@ -3,7 +3,7 @@ CC = cc
|
|||||||
LD = ld
|
LD = ld
|
||||||
LDFLAGS.EXTRA = -L/usr/X11R6/lib
|
LDFLAGS.EXTRA = -L/usr/X11R6/lib
|
||||||
LDFLAGS.GL = -lGLU -lGL -lX11 -lm
|
LDFLAGS.GL = -lGLU -lGL -lX11 -lm
|
||||||
LDFLAGS.STATIC = cr -Wl,-Bstatic
|
LDFLAGS.STATIC = -Wl,-Bstatic
|
||||||
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
||||||
CFLAGS.EXTRA += -I/usr/X11R6/include
|
CFLAGS.EXTRA += -I/usr/X11R6/include
|
||||||
NAME = GLEW
|
NAME = GLEW
|
||||||
|
@ -2,7 +2,6 @@ NAME = $(GLEW_NAME)
|
|||||||
CC = cc
|
CC = cc
|
||||||
LD = ld
|
LD = ld
|
||||||
CFLAGS.EXTRA = -I/usr/openwin/include -Kpic
|
CFLAGS.EXTRA = -I/usr/openwin/include -Kpic
|
||||||
LDFLAGS.STATIC = cr
|
|
||||||
LDFLAGS.SO = -G
|
LDFLAGS.SO = -G
|
||||||
LDFLAGS.EXTRA = -L/usr/openwin/lib
|
LDFLAGS.EXTRA = -L/usr/openwin/lib
|
||||||
LDFLAGS.GL = -lGL -lX11
|
LDFLAGS.GL = -lGL -lX11
|
||||||
|
@ -2,7 +2,6 @@ NAME = $(GLEW_NAME)
|
|||||||
CC = gcc
|
CC = gcc
|
||||||
LD = ld
|
LD = ld
|
||||||
CFLAGS.EXTRA = -I/usr/openwin/include -fPIC
|
CFLAGS.EXTRA = -I/usr/openwin/include -fPIC
|
||||||
LDFLAGS.STATIC = cr
|
|
||||||
LDFLAGS.SO = -G
|
LDFLAGS.SO = -G
|
||||||
LDFLAGS.EXTRA = -L/usr/openwin/lib
|
LDFLAGS.EXTRA = -L/usr/openwin/lib
|
||||||
LDFLAGS.GL = -lGL -lX11
|
LDFLAGS.GL = -lGL -lX11
|
||||||
|
Loading…
Reference in New Issue
Block a user