From 27582ff447ea7a97420acd03835ae9054eedc41d Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 9 Feb 2015 17:57:12 +0100 Subject: [PATCH] Remove HAVE_GL(ES) from dtool_config.h, we don't use it in source --- dtool/LocalSetup.pp | 9 +-------- makepanda/makepanda.py | 3 --- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp index e0e5c12ec5..cdea47c29f 100644 --- a/dtool/LocalSetup.pp +++ b/dtool/LocalSetup.pp @@ -382,19 +382,12 @@ $[cdefine USE_GENERIC_DXERR_LIBRARY] /* Define if we have zlib installed. */ $[cdefine HAVE_ZLIB] -/* Define if we have OpenGL installed and want to build for GL. */ -$[cdefine HAVE_GL] +/* Define the preconfigured minimum GL version number. */ #if HAVE_GL # define MIN_GL_VERSION_MAJOR $[word 1,$[MIN_GL_VERSION]] # define MIN_GL_VERSION_MINOR $[word 2,$[MIN_GL_VERSION]] #endif -/* Define if we have OpenGL ES installed and want to build for GLES. */ -$[cdefine HAVE_GLES] - -/* Define if we have OpenGL ES installed and want to build for GLES2. */ -$[cdefine HAVE_GLES2] - /* Define if we have OpenCV installed and want to build for OpenCV. */ $[cdefine HAVE_OPENCV] $[cdefine OPENCV_VER_23] diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 66efcad0aa..7de4d5c642 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -1951,9 +1951,6 @@ DTOOL_CONFIG=[ ("USE_PANDAFILESTREAM", '1', '1'), ("USE_DELETED_CHAIN", '1', '1'), ("HAVE_WIN_TOUCHINPUT", 'UNDEF', 'UNDEF'), - ("HAVE_GL", '1', 'UNDEF'), - ("HAVE_GLES", 'UNDEF', 'UNDEF'), - ("HAVE_GLES2", 'UNDEF', 'UNDEF'), ("HAVE_GLX", 'UNDEF', '1'), ("HAVE_EGL", 'UNDEF', 'UNDEF'), ("HAVE_WGL", '1', 'UNDEF'),