Prechádzať zdrojové kódy

Merge commit '7c16fe6d69c487c1148dd0dab6c4fd820bc69ec7' into main

Sam Lantinga 2 rokov pred
rodič
commit
7d454a4420
2 zmenil súbory, kde vykonal 3 pridanie a 4 odobranie
  1. 0 1
      cmake/sdlchecks.cmake
  2. 3 3
      include/SDL3/SDL_egl.h

+ 0 - 1
cmake/sdlchecks.cmake

@@ -670,7 +670,6 @@ macro(CheckVivante)
         find_library(VIVANTE_VDK_LIBRARY VDK REQUIRED)
         list(APPEND SDL_EXTRA_LIBS ${VIVANTE_LIBRARY} ${VIVANTE_VDK_LIBRARY})
       else()
-        list(APPEND SDL_PC_CFLAGS -DLINUX -DEGL_API_FB)
         list(APPEND SDL_EXTRA_LIBS EGL)
       endif(HAVE_VIVANTE_VDK)
     endif()

+ 3 - 3
include/SDL3/SDL_egl.h

@@ -24,7 +24,7 @@
  *
  *  This is a simple file to encapsulate the EGL API headers.
  */
-#if !defined(_MSC_VER) && !defined(__ANDROID__) && !defined(SDL_USE_BUILTIN_OPENGL_DEFINITIONS)
+#ifdef SDL_USE_SYSTEM_EGL_HEADERS
 
 #if defined(__vita__) || defined(__psp2__)
 #include <psp2/types.h>
@@ -33,7 +33,7 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
-#else /* _MSC_VER */
+#else /* !SDL_USE_SYSTEM_EGL_HEADERS */
 
 /* EGL headers for Visual Studio */
 
@@ -2349,4 +2349,4 @@ EGLAPI struct wl_buffer *EGLAPIENTRY eglCreateWaylandBufferFromImageWL (EGLDispl
 
 #endif /* __eglext_h_ */
 
-#endif /* _MSC_VER */
+#endif /* SDL_USE_SYSTEM_EGL_HEADERS */