mirror of
https://github.com/Perlmint/glew-cmake.git
synced 2024-11-27 00:51:55 +00:00
Merge https://github.com/nigels-com/glew.git into master HEAD at Mon Mar 30 17:44:15 GMT 2015
This commit is contained in:
commit
8019ddef45
11
Makefile
11
Makefile
@ -105,7 +105,11 @@ lib:
|
||||
mkdir lib
|
||||
|
||||
lib/$(LIB.STATIC): $(LIB.OBJS)
|
||||
ifneq ($(AR),)
|
||||
$(AR) $(ARFLAGS) $@ $^
|
||||
else ifneq ($(LIBTOOL),)
|
||||
$(LIBTOOL) $@ $^
|
||||
endif
|
||||
ifneq ($(STRIP),)
|
||||
$(STRIP) -x $@
|
||||
endif
|
||||
@ -149,7 +153,14 @@ glew.pc: glew.pc.in
|
||||
glew.lib.mx: lib lib/$(LIB.SHARED.MX) lib/$(LIB.STATIC.MX) glewmx.pc
|
||||
|
||||
lib/$(LIB.STATIC.MX): $(LIB.OBJS.MX)
|
||||
ifneq ($(AR),)
|
||||
$(AR) $(ARFLAGS) $@ $^
|
||||
else ifneq ($(LIBTOOL),)
|
||||
$(LIBTOOL) $@ $^
|
||||
endif
|
||||
ifneq ($(STRIP),)
|
||||
$(STRIP) -x $@
|
||||
endif
|
||||
|
||||
lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX)
|
||||
$(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
|
||||
|
@ -143,8 +143,12 @@ $(I.DEST)/glew.h: $(EXT)/.dummy
|
||||
$(BIN)/make_struct_var.pl GLEW_VAR_EXPORT $(GL_CORE_SPEC) $(GL_EXT_SPEC) >> $@
|
||||
echo -e "\n#ifdef GLEW_MX\n}; /* GLEWContextStruct */\n#endif /* GLEW_MX */\n" >> $@
|
||||
perl -e "s/GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2;/GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_1;\nGLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2;/" -pi $@
|
||||
rm -f $@.bak
|
||||
cat $(SRC)/glew_tail.h >> $@
|
||||
perl -e "s/GLEW_VERSION_STRING/$(GLEW_VERSION)/g" -pi $@
|
||||
perl -e "s/GLEW_VERSION_MAJOR_STRING/$(GLEW_MAJOR)/g" -pi $@
|
||||
perl -e "s/GLEW_VERSION_MINOR_STRING/$(GLEW_MINOR)/g" -pi $@
|
||||
perl -e "s/GLEW_VERSION_MICRO_STRING/$(GLEW_MICRO)/g" -pi $@
|
||||
rm -f $@.bak
|
||||
|
||||
$(I.DEST)/wglew.h: $(EXT)/.dummy
|
||||
@echo "--------------------------------------------------------------------"
|
||||
|
@ -13,6 +13,17 @@
|
||||
#define GLEW_VERSION_MINOR 3
|
||||
#define GLEW_VERSION_MICRO 4
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
/* GLEW version info */
|
||||
|
||||
/*
|
||||
VERSION GLEW_VERSION_STRING
|
||||
VERSION_MAJOR GLEW_VERSION_MAJOR_STRING
|
||||
VERSION_MINOR GLEW_VERSION_MINOR_STRING
|
||||
VERSION_MICRO GLEW_VERSION_MICRO_STRING
|
||||
*/
|
||||
|
||||
/* API */
|
||||
#ifdef GLEW_MX
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
NAME = $(GLEW_NAME)
|
||||
CC = cc
|
||||
LD = cc
|
||||
AR = LIBTOOL
|
||||
ARFLAGS = -static -o
|
||||
AR =
|
||||
LIBTOOL = libtool -static -o
|
||||
STRIP =
|
||||
CFLAGS.EXTRA = -dynamic -fno-common
|
||||
#CFLAGS.EXTRA += -no-cpp-precomp
|
||||
|
Loading…
Reference in New Issue
Block a user