Remove unnecessary HAVE_EGL setting in dtool_config.h

This commit is contained in:
rdb 2015-11-28 16:23:18 +01:00
parent 84c0fbd1b1
commit e5fac610c8
3 changed files with 3 additions and 15 deletions

View File

@ -2097,7 +2097,6 @@ DTOOL_CONFIG=[
("USE_DELETED_CHAIN", '1', '1'),
("HAVE_WIN_TOUCHINPUT", 'UNDEF', 'UNDEF'),
("HAVE_GLX", 'UNDEF', '1'),
("HAVE_EGL", 'UNDEF', 'UNDEF'),
("HAVE_WGL", '1', 'UNDEF'),
("HAVE_DX9", 'UNDEF', 'UNDEF'),
("HAVE_CHROMIUM", 'UNDEF', 'UNDEF'),

View File

@ -11,7 +11,7 @@
#if defined(ANDROID)
#include "config_androiddisplay.h"
#include "androidGraphicsPipe.h"
#elif defined(HAVE_EGL)
#else
#include "config_egldisplay.h"
#include "eglGraphicsPipe.h"
#endif
@ -36,7 +36,7 @@ init_libpandagles() {
#if defined(ANDROID)
init_libandroiddisplay();
#elif defined(HAVE_EGL)
#else
init_libegldisplay();
#endif
}
@ -50,9 +50,7 @@ int
get_pipe_type_pandagles() {
#if defined(ANDROID)
return AndroidGraphicsPipe::get_class_type().get_index();
#elif defined(HAVE_EGL)
#else
return eglGraphicsPipe::get_class_type().get_index();
#endif
return 0;
}

View File

@ -8,10 +8,8 @@
#define OPENGLES_2
#include "config_gles2gsg.h"
#ifdef HAVE_EGL
#include "config_egldisplay.h"
#include "eglGraphicsPipe.h"
#endif
// By including checkPandaVersion.h, we guarantee that runtime
// attempts to load libpandagles2.so/.dll will fail if they inadvertently
@ -30,10 +28,7 @@
void
init_libpandagles2() {
init_libgles2gsg();
#ifdef HAVE_EGL
init_libegldisplay();
#endif
}
////////////////////////////////////////////////////////////////////
@ -43,9 +38,5 @@ init_libpandagles2() {
////////////////////////////////////////////////////////////////////
int
get_pipe_type_pandagles2() {
#ifdef HAVE_EGL
return eglGraphicsPipe::get_class_type().get_index();
#endif
return 0;
}