mirror of
https://github.com/nigels-com/glew.git
synced 2025-02-21 16:09:25 +00:00
For ID: 3148451 - bad dll perms on default cygwin 1.7.7 install
This commit is contained in:
parent
bb3e797929
commit
dea5a6143c
16
Makefile
16
Makefile
@ -181,8 +181,9 @@ install.lib: glew.lib
|
|||||||
$(INSTALL) -d -m 0755 $(LIBDIR)
|
$(INSTALL) -d -m 0755 $(LIBDIR)
|
||||||
# runtime
|
# runtime
|
||||||
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
||||||
|
$(INSTALL) -d -m 0755 $(BINDIR)
|
||||||
$(STRIP) -x lib/$(LIB.SHARED)
|
$(STRIP) -x lib/$(LIB.SHARED)
|
||||||
$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
|
$(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/
|
||||||
else
|
else
|
||||||
$(STRIP) -x lib/$(LIB.SHARED)
|
$(STRIP) -x lib/$(LIB.SHARED)
|
||||||
$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
|
$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
|
||||||
@ -192,17 +193,18 @@ endif
|
|||||||
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
||||||
$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
|
$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
|
||||||
else
|
else
|
||||||
$(STRIP) -x lib/$(LIB.STATIC)
|
|
||||||
$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
|
|
||||||
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
|
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
|
||||||
endif
|
endif
|
||||||
|
$(STRIP) -x lib/$(LIB.STATIC)
|
||||||
|
$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
|
||||||
|
|
||||||
install.lib.mx: glew.lib.mx
|
install.lib.mx: glew.lib.mx
|
||||||
$(INSTALL) -d -m 0755 $(LIBDIR)
|
$(INSTALL) -d -m 0755 $(LIBDIR)
|
||||||
# runtime
|
# runtime
|
||||||
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
||||||
|
$(INSTALL) -d -m 0755 $(BINDIR)
|
||||||
$(STRIP) -x lib/$(LIB.SHARED.MX)
|
$(STRIP) -x lib/$(LIB.SHARED.MX)
|
||||||
$(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(BINDIR)/
|
$(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/
|
||||||
else
|
else
|
||||||
$(STRIP) -x lib/$(LIB.SHARED.MX)
|
$(STRIP) -x lib/$(LIB.SHARED.MX)
|
||||||
$(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/
|
$(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/
|
||||||
@ -212,10 +214,10 @@ endif
|
|||||||
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
||||||
$(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/
|
$(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/
|
||||||
else
|
else
|
||||||
$(STRIP) -x lib/$(LIB.STATIC.MX)
|
|
||||||
$(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/
|
|
||||||
$(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX)
|
$(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX)
|
||||||
endif
|
endif
|
||||||
|
$(STRIP) -x lib/$(LIB.STATIC.MX)
|
||||||
|
$(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/
|
||||||
|
|
||||||
install.bin: glew.bin
|
install.bin: glew.bin
|
||||||
$(INSTALL) -d -m 0755 $(BINDIR)
|
$(INSTALL) -d -m 0755 $(BINDIR)
|
||||||
@ -247,8 +249,8 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
|
|||||||
else
|
else
|
||||||
$(RM) $(LIBDIR)/$(LIB.SONAME) $(LIBDIR)/$(LIB.SONAME.MX)
|
$(RM) $(LIBDIR)/$(LIB.SONAME) $(LIBDIR)/$(LIB.SONAME.MX)
|
||||||
$(RM) $(LIBDIR)/$(LIB.SHARED) $(LIBDIR)/$(LIB.SHARED.MX)
|
$(RM) $(LIBDIR)/$(LIB.SHARED) $(LIBDIR)/$(LIB.SHARED.MX)
|
||||||
$(RM) $(LIBDIR)/$(LIB.STATIC) $(LIBDIR)/$(LIB.STATIC.MX)
|
|
||||||
endif
|
endif
|
||||||
|
$(RM) $(LIBDIR)/$(LIB.STATIC) $(LIBDIR)/$(LIB.STATIC.MX)
|
||||||
$(RM) $(BINDIR)/$(GLEWINFO.BIN) $(BINDIR)/$(VISUALINFO.BIN)
|
$(RM) $(BINDIR)/$(GLEWINFO.BIN) $(BINDIR)/$(VISUALINFO.BIN)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
NAME = GLEW
|
NAME = GLEW
|
||||||
GLEW_DEST ?= /usr/X11R6
|
GLEW_DEST ?= /usr
|
||||||
CC = cc
|
CC = cc
|
||||||
# use gcc for linking, with ld it does not work
|
# use gcc for linking, with ld it does not work
|
||||||
LD = cc
|
LD = cc
|
||||||
LDFLAGS.EXTRA = -L/usr/X11R6/lib
|
LDFLAGS.EXTRA =
|
||||||
LIBDIR = $(GLEW_DEST)/lib
|
LIBDIR = $(GLEW_DEST)/lib
|
||||||
LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
|
LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
|
||||||
LDFLAGS.STATIC = -Wl,-Bstatic
|
LDFLAGS.STATIC = -Wl,-Bstatic
|
||||||
@ -11,13 +11,13 @@ LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
|||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
BIN.SUFFIX = .exe
|
BIN.SUFFIX = .exe
|
||||||
LIB.SONAME = cyg$(NAME)-$(SO_MAJOR).dll
|
LIB.SONAME = cyg$(NAME)-$(GLEW_MAJOR)-$(GLEW_MINOR).dll
|
||||||
LIB.DEVLNK = lib$(NAME).dll.a
|
LIB.DEVLNK = lib$(NAME).dll.a
|
||||||
LIB.SHARED = cyg$(NAME)-$(SO_MAJOR).dll
|
LIB.SHARED = cyg$(NAME)-$(GLEW_MAJOR)-$(GLEW_MINOR).dll
|
||||||
LIB.STATIC = lib$(NAME).a
|
LIB.STATIC = lib$(NAME).a
|
||||||
LDFLAGS.SO = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK)
|
LDFLAGS.SO = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK)
|
||||||
LIB.SONAME.MX = cyg$(NAME)mx-$(SO_MAJOR).dll
|
LIB.SONAME.MX = cyg$(NAME)mx-$(GLEW_MAJOR)-$(GLEW_MINOR).dll
|
||||||
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a
|
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a
|
||||||
LIB.SHARED.MX = cyg$(NAME)mx-$(SO_MAJOR).dll
|
LIB.SHARED.MX = cyg$(NAME)mx-$(GLEW_MAJOR)-$(GLEW_MINOR).dll
|
||||||
LIB.STATIC.MX = lib$(NAME)mx.a
|
LIB.STATIC.MX = lib$(NAME)mx.a
|
||||||
LDFLAGS.SO.MX = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK.MX)
|
LDFLAGS.SO.MX = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK.MX)
|
||||||
|
Loading…
Reference in New Issue
Block a user