Zengtudor/glew
1
0
Fork 0
mirror of https://github.com/nigels-com/glew.git synced 2025-04-20 23:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation with MinGW

Browse Source
This commit is contained in:
Cameron Cawley 2021-04-10 23:07:53 +01:00
parent 80e061f85d
commit d2ce1df87a
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -48,8 +48,11 @@ INCDIR ?= $(GLEW_DEST)/include/GL
PKGDIR ?= $(GLEW_DEST)/lib/pkgconfig PKGDIR ?= $(GLEW_DEST)/lib/pkgconfig
ifneq ($(GLEW_NO_GLU), -DGLEW_NO_GLU) ifneq ($(GLEW_NO_GLU), -DGLEW_NO_GLU)
# MinGW does not provide a .pc file for glu
ifeq ($(filter mingw%,$(SYSTEM)),)
LIBGLU = glu LIBGLU = glu
endif endif
endif
DIST_NAME ?= glew-$(GLEW_VERSION) DIST_NAME ?= glew-$(GLEW_VERSION)
DIST_SRC_ZIP ?= $(shell pwd)/$(DIST_NAME).zip DIST_SRC_ZIP ?= $(shell pwd)/$(DIST_NAME).zip

2
auto/src/glew_head.c
View File

@ -133,7 +133,7 @@ void* NSGLGetProcAddress (const GLubyte *name)
#elif defined(GLEW_EGL) #elif defined(GLEW_EGL)
# define glewGetProcAddress(name) eglGetProcAddress((const char *)name) # define glewGetProcAddress(name) eglGetProcAddress((const char *)name)
#elif defined(_WIN32) #elif defined(_WIN32)
# define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name) # define glewGetProcAddress(name) (void *)wglGetProcAddress((LPCSTR)name)
#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
# define glewGetProcAddress(name) NSGLGetProcAddress(name) # define glewGetProcAddress(name) NSGLGetProcAddress(name)
#elif defined(__sgi) || defined(__sun) || defined(__HAIKU__) #elif defined(__sgi) || defined(__sun) || defined(__HAIKU__)

2
build/cmake/CMakeLists.txt
View File

@ -239,7 +239,7 @@ set (cflags)
set (requireslib glu) set (requireslib glu)
# Mac OSX has no glu.pc unless optional X11/GLX is installed # Mac OSX has no glu.pc unless optional X11/GLX is installed
if (APPLE) if (WIN32 OR APPLE)
set (requireslib) set (requireslib)
endif () endif ()

6
config/Makefile.mingw
View File

@ -4,9 +4,11 @@ CC := gcc -fno-builtin
LD := gcc LD := gcc
LN := LN :=
LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32
ifneq ($(GLEW_NO_GLU), -DGLEW_NO_GLU)
LDFLAGS.GL := -lglu32 $(LDFLAGS.GL)
endif
LDFLAGS.EXTRA = -L/mingw/lib LDFLAGS.EXTRA = -L/mingw/lib
CFLAGS.EXTRA += -fno-builtin -fno-stack-protector CFLAGS.EXTRA += -fno-builtin -fno-stack-protector
LDFLAGS.EXTRA += -nostdlib
WARN = -Wall -W WARN = -Wall -W
POPT = -O2 POPT = -O2
BIN.SUFFIX = .exe BIN.SUFFIX = .exe
@ -14,4 +16,4 @@ 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 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 = -nostdlib -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)