瀏覽代碼

Remove HAVE_GL(ES) from dtool_config.h, we don't use it in source

rdb 11 年之前
父節點
當前提交
27582ff447
共有 2 個文件被更改,包括 1 次插入11 次删除
  1. 1 8
      dtool/LocalSetup.pp
  2. 0 3
      makepanda/makepanda.py

+ 1 - 8
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]

+ 0 - 3
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'),