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

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

View File

@ -15,6 +15,10 @@ PYTHON ?= python
EXT = extensions/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
SRC = src
BLACKLIST = blacklist
@ -89,9 +93,9 @@ OpenGL-Registry/.dummy:
@echo "--------------------------------------------------------------------"
@echo "Downloading OpenGL-Registry"
@echo "--------------------------------------------------------------------"
git clone https://github.com/KhronosGroup/OpenGL-Registry.git OpenGL-Registry
git clone https://github.com/KhronosGroup/EGL-Registry.git EGL-Registry
git clone --branch glew https://github.com/nigels-com/glfixes glfixes
git clone $(REPO_OPENGL) OpenGL-Registry
git clone $(REPO_EGL) EGL-Registry
git clone --branch glew $(REPO_GLFIXES) glfixes
touch $@
$(EXT)/.dummy: OpenGL-Registry/.dummy

View File

@ -127,7 +127,11 @@ GLboolean glewParseArgs (int argc, char** argv, struct createParams *params)
if (!strcmp(argv[p], "-version"))
{
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;
#endif
}
else if (!strcmp(argv[p], "-profile"))
{