Zengtudor/glew-cmake
1
0
Fork 0
mirror of https://github.com/Perlmint/glew-cmake.git synced 2024-11-22 14:45:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved Cygwin support as proposed in Feature Request ID: 3081290

Browse Source 
git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@626 783a27ee-832a-0410-bc00-9f386506c6dd
This commit is contained in:
nigels 2010-10-29 05:14:45 +00:00
parent f55e3a1b1f
commit 0b890ef852
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -90,7 +90,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS)
lib/$(LIB.SHARED): $(LIB.SOBJS) lib/$(LIB.SHARED): $(LIB.SOBJS)
$(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) $(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw) ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
else else
$(LN) $(LIB.SHARED) lib/$(LIB.SONAME) $(LN) $(LIB.SHARED) lib/$(LIB.SONAME)
$(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK) $(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK)
@ -127,7 +127,7 @@ install: all
$(INSTALL) -d -m 0755 $(LIBDIR) $(INSTALL) -d -m 0755 $(LIBDIR)
$(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig
# runtime # runtime
ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw) ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
$(STRIP) -x lib/$(LIB.SHARED) $(STRIP) -x lib/$(LIB.SHARED)
$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/ $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
else else
@ -140,7 +140,7 @@ endif
$(INSTALL) -m 0644 include/GL/glew.h $(INCDIR)/ $(INSTALL) -m 0644 include/GL/glew.h $(INCDIR)/
$(INSTALL) -m 0644 include/GL/glxew.h $(INCDIR)/ $(INSTALL) -m 0644 include/GL/glxew.h $(INCDIR)/
$(INSTALL) -m 0644 glew.pc $(LIBDIR)/pkgconfig/ $(INSTALL) -m 0644 glew.pc $(LIBDIR)/pkgconfig/
ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw) 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) $(STRIP) -x lib/$(LIB.STATIC)
@ -155,7 +155,7 @@ uninstall:
$(RM) $(INCDIR)/glew.h $(RM) $(INCDIR)/glew.h
$(RM) $(INCDIR)/glxew.h $(RM) $(INCDIR)/glxew.h
$(RM) $(LIBDIR)/$(LIB.DEVLNK) $(RM) $(LIBDIR)/$(LIB.DEVLNK)
ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw) ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
$(RM) $(BINDIR)/$(LIB.SHARED) $(RM) $(BINDIR)/$(LIB.SHARED)
else else
$(RM) $(LIBDIR)/$(LIB.SONAME) $(RM) $(LIBDIR)/$(LIB.SONAME)

10
config/Makefile.cygwin
View File

@ -6,7 +6,7 @@ LD = cc
ifneq (undefined, $(origin GLEW_MX)) ifneq (undefined, $(origin GLEW_MX))
CFLAGS.EXTRA = -DGLEW_MX CFLAGS.EXTRA = -DGLEW_MX
endif endif
LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) LDFLAGS.SO = -shared -Wl,--out-implib,lib/$(LIB.DEVLNK)
LDFLAGS.EXTRA = -L/usr/X11R6/lib LDFLAGS.EXTRA = -L/usr/X11R6/lib
LIBDIR = $(GLEW_DEST)/lib LIBDIR = $(GLEW_DEST)/lib
LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
@ -14,8 +14,8 @@ LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic LDFLAGS.DYNAMIC = -Wl,-Bdynamic
WARN = -Wall -W WARN = -Wall -W
POPT = -O2 POPT = -O2
BIN.SUFFIX = BIN.SUFFIX = .exe
LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) LIB.SONAME = cyg$(NAME)-$(SO_MAJOR).dll
LIB.DEVLNK = lib$(NAME).so LIB.DEVLNK = lib$(NAME).dll.a
LIB.SHARED = lib$(NAME).so.$(SO_VERSION) LIB.SHARED = cyg$(NAME)-$(SO_MAJOR).dll
LIB.STATIC = lib$(NAME).a LIB.STATIC = lib$(NAME).a