Zengtudor/glew-cmake
1
0
Fork 0
mirror of https://github.com/Perlmint/glew-cmake.git synced 2024-11-13 10:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/nigels-com/glew.git into master HEAD at Mon Jan 28 17:44:16 GMT 2019

Browse Source
This commit is contained in:
Gyusun Yeom 2019-01-29 02:44:16 +09:00
commit 923d1cadf3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
auto/Makefile
View File

@ -15,6 +15,10 @@ PYTHON ?= python
EXT = extensions/gl EXT = extensions/gl
CORE = core/gl CORE = core/gl
REPO_OPENGL ?= https://github.com/KhronosGroup/OpenGL-Registry.git
REPO_EGL ?= https://github.com/KhronosGroup/EGL-Registry.git
REPO_GLFIXES ?= https://github.com/nigels-com/glfixes
BIN = bin BIN = bin
SRC = src SRC = src
BLACKLIST = blacklist BLACKLIST = blacklist
@ -89,9 +93,9 @@ OpenGL-Registry/.dummy:
@echo "--------------------------------------------------------------------" @echo "--------------------------------------------------------------------"
@echo "Downloading OpenGL-Registry" @echo "Downloading OpenGL-Registry"
@echo "--------------------------------------------------------------------" @echo "--------------------------------------------------------------------"
git clone https://github.com/KhronosGroup/OpenGL-Registry.git OpenGL-Registry git clone $(REPO_OPENGL) OpenGL-Registry
git clone https://github.com/KhronosGroup/EGL-Registry.git EGL-Registry git clone $(REPO_EGL) EGL-Registry
git clone --branch glew https://github.com/nigels-com/glfixes glfixes git clone --branch glew $(REPO_GLFIXES) glfixes
touch $@ touch $@
$(EXT)/.dummy: OpenGL-Registry/.dummy $(EXT)/.dummy: OpenGL-Registry/.dummy

4
auto/src/glewinfo_tail.c
View File

@ -127,7 +127,11 @@ GLboolean glewParseArgs (int argc, char** argv, struct createParams *params)
if (!strcmp(argv[p], "-version")) if (!strcmp(argv[p], "-version"))
{ {
if (++p >= argc) return GL_TRUE; if (++p >= argc) return GL_TRUE;
#if defined(__STDC_LIB_EXT1__) || (defined(_MSC_VER) && (_MSC_VER >= 1400))
if (sscanf_s(argv[p++], "%d.%d", &params->major, &params->minor) != 2) return GL_TRUE;
#else
if (sscanf(argv[p++], "%d.%d", &params->major, &params->minor) != 2) return GL_TRUE; if (sscanf(argv[p++], "%d.%d", &params->major, &params->minor) != 2) return GL_TRUE;
#endif
} }
else if (!strcmp(argv[p], "-profile")) else if (!strcmp(argv[p], "-profile"))
{ {