Merge 84196348a6 into ba71151c6a

auto/bin/filter_gl_ext.sh

@@ -610,6 +610,16 @@ EOT
     typedef void (APIENTRY *GLVULKANPROCNV)(void)
 EOT
 
+# remove duplicates in GL_EXT_fragment_shading_rate and GL_EXT_fragment_shading_rate_primitive
+    tail -n +5 $1/GL_EXT_fragment_shading_rate_primitive > patterns
+    grep -v -F -f patterns $1/GL_EXT_fragment_shading_rate_primitive > tmp
+    mv tmp $1/GL_EXT_fragment_shading_rate_primitive
+
+# remove duplicates in GL_EXT_fragment_shading_rate and GL_EXT_fragment_shading_rate_attachment
+    tail -n +5 $1/GL_EXT_fragment_shading_rate_attachment > patterns
+    grep -v -F -f patterns $1/GL_EXT_fragment_shading_rate_attachment > tmp
+    mv tmp $1/GL_EXT_fragment_shading_rate_attachment
+
 # GLU extensions are not relevant here
     rm -f $1/GL_GLU_*
 

build/cmake/CMakeLists.txt

@@ -107,7 +107,7 @@ set (GLEW_PUBLIC_HEADERS_FILES
 )
 set (GLEW_SRC_FILES ${GLEW_DIR}/src/glew.c)
 
-if (WIN32)
+if (MSVC)
   list (APPEND GLEW_SRC_FILES ${GLEW_DIR}/build/glew.rc)
 endif ()
 
@@ -179,7 +179,7 @@ install ( TARGETS ${targets_to_install}
 
 if (BUILD_UTILS)
   set (GLEWINFO_SRC_FILES ${GLEW_DIR}/src/glewinfo.c)
-  if (WIN32)
+  if (MSVC)
     list (APPEND GLEWINFO_SRC_FILES ${GLEW_DIR}/build/glewinfo.rc)
   endif ()
   add_executable (glewinfo ${GLEWINFO_SRC_FILES})
@@ -193,7 +193,7 @@ if (BUILD_UTILS)
   endif ()
 
   set (VISUALINFO_SRC_FILES ${GLEW_DIR}/src/visualinfo.c)
-  if (WIN32)
+  if (MSVC)
     list (APPEND VISUALINFO_SRC_FILES ${GLEW_DIR}/build/visualinfo.rc)
   endif ()
   add_executable (visualinfo ${VISUALINFO_SRC_FILES})