mirror of
https://github.com/Perlmint/glew-cmake.git
synced 2024-11-27 09:01:57 +00:00
Merge https://github.com/nigels-com/glew.git into master HEAD at Sat Sep 27 17:52:51 GMT 2014
This commit is contained in:
commit
4b50556664
4
Makefile
4
Makefile
@ -125,7 +125,7 @@ tmp/$(SYSTEM)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wgl
|
|||||||
|
|
||||||
tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
|
tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
|
||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
$(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
|
$(CC) -DGLEW_NO_GLU -DGLEW_BUILD $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
|
||||||
|
|
||||||
# Force re-write of glew.pc, GLEW_DEST can vary
|
# Force re-write of glew.pc, GLEW_DEST can vary
|
||||||
|
|
||||||
@ -166,7 +166,7 @@ tmp/$(SYSTEM)/mx/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h
|
|||||||
|
|
||||||
tmp/$(SYSTEM)/mx/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
|
tmp/$(SYSTEM)/mx/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
|
||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
$(CC) -DGLEW_NO_GLU -DGLEW_MX $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
|
$(CC) -DGLEW_NO_GLU -DGLEW_MX -DGLEW_BUILD $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
|
||||||
|
|
||||||
# Force re-write of glewmx.pc, GLEW_DEST can vary
|
# Force re-write of glewmx.pc, GLEW_DEST can vary
|
||||||
|
|
||||||
|
@ -4,6 +4,8 @@ If you downloaded the tarball from the GLEW website, you just need to:
|
|||||||
|
|
||||||
Unix:
|
Unix:
|
||||||
|
|
||||||
|
make extensions
|
||||||
|
|
||||||
make
|
make
|
||||||
|
|
||||||
sudo -s
|
sudo -s
|
||||||
@ -14,7 +16,7 @@ If you downloaded the tarball from the GLEW website, you just need to:
|
|||||||
|
|
||||||
Windows:
|
Windows:
|
||||||
|
|
||||||
use the project file in build/vc6/
|
use the project file in build/vc12/
|
||||||
|
|
||||||
If you wish to build GLEW from scratch (update the extension data from
|
If you wish to build GLEW from scratch (update the extension data from
|
||||||
the net or add your own extension information), you need a Unix
|
the net or add your own extension information), you need a Unix
|
||||||
@ -22,3 +24,8 @@ environment (including wget, perl, and GNU make). The extension data
|
|||||||
is regenerated from the top level source directory with:
|
is regenerated from the top level source directory with:
|
||||||
|
|
||||||
make extensions
|
make extensions
|
||||||
|
|
||||||
|
An alternative to generating the GLEW sources from scratch is to
|
||||||
|
download a pre-generated (unsupported) snapshot:
|
||||||
|
|
||||||
|
https://sourceforge.net/projects/glew/files/glew/snapshots/
|
||||||
|
@ -349,11 +349,16 @@ foreach my $spec (sort @speclist)
|
|||||||
} else {
|
} else {
|
||||||
if (${$tokens}{$b} =~ /_/) {
|
if (${$tokens}{$b} =~ /_/) {
|
||||||
1
|
1
|
||||||
|
} else {
|
||||||
|
if (hex ${$tokens}{$a} eq hex ${$tokens}{$b})
|
||||||
|
{
|
||||||
|
$a cmp $b
|
||||||
} else {
|
} else {
|
||||||
hex ${$tokens}{$a} <=> hex ${$tokens}{$b}
|
hex ${$tokens}{$a} <=> hex ${$tokens}{$b}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} keys %{$tokens})
|
} keys %{$tokens})
|
||||||
{
|
{
|
||||||
if ($token =~ /^$prefix\_.*/i)
|
if ($token =~ /^$prefix\_.*/i)
|
||||||
|
@ -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 :=
|
||||||
CFLAGS.SO = -DGLEW_BUILD
|
|
||||||
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
|
||||||
@ -16,10 +15,10 @@ BIN.SUFFIX = .exe
|
|||||||
LIB.SONAME = lib$(NAME).dll
|
LIB.SONAME = lib$(NAME).dll
|
||||||
LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
|
LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
|
||||||
LIB.SHARED = $(NAME).dll
|
LIB.SHARED = $(NAME).dll
|
||||||
LIB.STATIC = lib$(NAME).a # the static lib will be broken (see CFLAGS.SO)
|
LIB.STATIC = lib$(NAME).a # the static lib will be broken
|
||||||
LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)
|
LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)
|
||||||
LIB.SONAME.MX = lib$(NAME)mx.dll
|
LIB.SONAME.MX = lib$(NAME)mx.dll
|
||||||
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
|
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
|
||||||
LIB.SHARED.MX = $(NAME)mx.dll
|
LIB.SHARED.MX = $(NAME)mx.dll
|
||||||
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken (see CFLAGS.SO)
|
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken
|
||||||
LDFLAGS.SO.MX = -shared -Wl,-soname,$(LIB.SONAME.MX) -Wl,--out-implib,lib/$(LIB.DEVLNK.MX)
|
LDFLAGS.SO.MX = -shared -Wl,-soname,$(LIB.SONAME.MX) -Wl,--out-implib,lib/$(LIB.DEVLNK.MX)
|
||||||
|
@ -9,7 +9,6 @@ CC := i686-w64-mingw32-gcc
|
|||||||
LD := i686-w64-mingw32-ld
|
LD := i686-w64-mingw32-ld
|
||||||
LN :=
|
LN :=
|
||||||
STRIP :=
|
STRIP :=
|
||||||
CFLAGS.SO = -DGLEW_BUILD
|
|
||||||
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
@ -17,10 +16,10 @@ BIN.SUFFIX = .exe
|
|||||||
LIB.SONAME = lib$(NAME).dll
|
LIB.SONAME = lib$(NAME).dll
|
||||||
LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
|
LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
|
||||||
LIB.SHARED = $(NAME).dll
|
LIB.SHARED = $(NAME).dll
|
||||||
LIB.STATIC = lib$(NAME).a # the static lib will be broken (see CFLAGS.SO)
|
LIB.STATIC = lib$(NAME).a # the static lib will be broken
|
||||||
LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK)
|
LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK)
|
||||||
LIB.SONAME.MX = lib$(NAME)mx.dll
|
LIB.SONAME.MX = lib$(NAME)mx.dll
|
||||||
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
|
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
|
||||||
LIB.SHARED.MX = $(NAME)mx.dll
|
LIB.SHARED.MX = $(NAME)mx.dll
|
||||||
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken (see CFLAGS.SO)
|
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken
|
||||||
LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX)
|
LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX)
|
||||||
|
@ -9,7 +9,6 @@ CC := i586-mingw32msvc-gcc
|
|||||||
LD := i586-mingw32msvc-ld
|
LD := i586-mingw32msvc-ld
|
||||||
LN :=
|
LN :=
|
||||||
STRIP :=
|
STRIP :=
|
||||||
CFLAGS.SO = -DGLEW_BUILD
|
|
||||||
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
@ -17,10 +16,10 @@ BIN.SUFFIX = .exe
|
|||||||
LIB.SONAME = lib$(NAME).dll
|
LIB.SONAME = lib$(NAME).dll
|
||||||
LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
|
LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
|
||||||
LIB.SHARED = $(NAME).dll
|
LIB.SHARED = $(NAME).dll
|
||||||
LIB.STATIC = lib$(NAME).a # the static lib will be broken (see CFLAGS.SO)
|
LIB.STATIC = lib$(NAME).a # the static lib will be broken
|
||||||
LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK)
|
LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK)
|
||||||
LIB.SONAME.MX = lib$(NAME)mx.dll
|
LIB.SONAME.MX = lib$(NAME)mx.dll
|
||||||
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
|
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
|
||||||
LIB.SHARED.MX = $(NAME)mx.dll
|
LIB.SHARED.MX = $(NAME)mx.dll
|
||||||
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken (see CFLAGS.SO)
|
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken
|
||||||
LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX)
|
LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX)
|
||||||
|
@ -5,11 +5,10 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
NAME := glew32
|
NAME := glew32
|
||||||
CC := amd64-mingw32msvc-gcc
|
CC := i686-w64-mingw32-gcc
|
||||||
LD := amd64-mingw32msvc-ld
|
LD := i686-w64-mingw32-ld
|
||||||
LN :=
|
LN :=
|
||||||
STRIP :=
|
STRIP :=
|
||||||
CFLAGS.SO = -DGLEW_BUILD
|
|
||||||
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
|
||||||
WARN = -Wall -W
|
WARN = -Wall -W
|
||||||
POPT = -O2
|
POPT = -O2
|
||||||
@ -17,10 +16,10 @@ BIN.SUFFIX = .exe
|
|||||||
LIB.SONAME = lib$(NAME).dll
|
LIB.SONAME = lib$(NAME).dll
|
||||||
LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
|
LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
|
||||||
LIB.SHARED = $(NAME).dll
|
LIB.SHARED = $(NAME).dll
|
||||||
LIB.STATIC = lib$(NAME).a # the static lib will be broken (see CFLAGS.SO)
|
LIB.STATIC = lib$(NAME).a # the static lib will be broken
|
||||||
LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK)
|
LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK)
|
||||||
LIB.SONAME.MX = lib$(NAME)mx.dll
|
LIB.SONAME.MX = lib$(NAME)mx.dll
|
||||||
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
|
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
|
||||||
LIB.SHARED.MX = $(NAME)mx.dll
|
LIB.SHARED.MX = $(NAME)mx.dll
|
||||||
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken (see CFLAGS.SO)
|
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken
|
||||||
LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX)
|
LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX) --out-implib lib/$(LIB.DEVLNK.MX)
|
||||||
|
@ -3,7 +3,6 @@ NAME = glew32
|
|||||||
CC := gcc
|
CC := gcc
|
||||||
LD := gcc
|
LD := gcc
|
||||||
LN :=
|
LN :=
|
||||||
CFLAGS.SO = -DGLEW_BUILD
|
|
||||||
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
|
||||||
@ -12,10 +11,10 @@ BIN.SUFFIX = .exe
|
|||||||
LIB.SONAME = lib$(NAME).dll
|
LIB.SONAME = lib$(NAME).dll
|
||||||
LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
|
LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
|
||||||
LIB.SHARED = $(NAME).dll
|
LIB.SHARED = $(NAME).dll
|
||||||
LIB.STATIC = lib$(NAME).a # the static lib will be broken (see CFLAGS.SO)
|
LIB.STATIC = lib$(NAME).a # the static lib will be broken
|
||||||
LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)
|
LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)
|
||||||
LIB.SONAME.MX = lib$(NAME)mx.dll
|
LIB.SONAME.MX = lib$(NAME)mx.dll
|
||||||
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
|
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
|
||||||
LIB.SHARED.MX = $(NAME)mx.dll
|
LIB.SHARED.MX = $(NAME)mx.dll
|
||||||
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken (see CFLAGS.SO)
|
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken
|
||||||
LDFLAGS.SO.MX = -shared -Wl,-soname,$(LIB.SONAME.MX) -Wl,--out-implib,lib/$(LIB.DEVLNK.MX)
|
LDFLAGS.SO.MX = -shared -Wl,-soname,$(LIB.SONAME.MX) -Wl,--out-implib,lib/$(LIB.DEVLNK.MX)
|
||||||
|
Loading…
Reference in New Issue
Block a user