Zengtudor/glew
1
0
Fork 0
mirror of https://github.com/nigels-com/glew.git synced 2024-11-23 06:15:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from BastiaanOlij/master

Browse Source 
Changing over makefiles so LDFLAGS.STATIC is used. Also added makefile.d...
This commit is contained in:
Nigel Stewart 2015-03-26 19:34:41 +10:00
commit 1fed499560
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -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 ?= 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) cr $@ $^ $(AR) $(ARFLAGS) $@ $^
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) cr $@ $^ $(AR) $(ARFLAGS) $@ $^
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)

31
config/Makefile.darwin-universal Normal file
View File

@ -0,0 +1,31 @@
NAME = $(GLEW_NAME)
CC = cc
LD = cc
AR = LIBTOOL
ARFLAGS = -static -o
STRIP =
CFLAGS.EXTRA = -dynamic -fno-common
#CFLAGS.EXTRA += -no-cpp-precomp
CFLAGS.EXTRA += -arch i386 -arch x86_64
LDFLAGS.EXTRA = -arch i386 -arch x86_64
ifneq (undefined, $(origin GLEW_APPLE_GLX))
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
else
LDFLAGS.GL = -framework AGL -framework OpenGL
endif
LDFLAGS.DYNAMIC =
WARN = -Wall -W
POPT = -O2
CFLAGS.EXTRA += -fPIC
BIN.SUFFIX =
LIB.SONAME = lib$(NAME).$(SO_MAJOR).dylib
LIB.DEVLNK = lib$(NAME).dylib
LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib
LIB.STATIC = lib$(NAME).a
LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR)
LIB.SONAME.MX = lib$(NAME)mx.$(SO_MAJOR).dylib
LIB.DEVLNK.MX = lib$(NAME)mx.dylib
LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib
LIB.STATIC.MX = lib$(NAME)mx.a
LDFLAGS.SO.MX = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED.MX) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR)