Merge remote-tracking branch 'origin/master' into x86

2021-04-09 16:04:44 +01:00 · 2021-04-09 16:04:44 +01:00 · 9731f38a06
commit 9731f38a06
parent bfd8088af5 03694d85bf
2 changed files with 7 additions and 7 deletions
--- a/include/GL/glu.h
+++ b/include/GL/glu.h
@ -17,7 +17,7 @@
 __BEGIN_DECLS

 #ifndef BUILD_LIBGL
-#include <GL/gl.h>
+#include <gl.h>
 #endif

 #define GLU_FALSE 0
--- a/samples/multitexture_arrays/pvr-texture.c
+++ b/samples/multitexture_arrays/pvr-texture.c
@ -93,12 +93,12 @@ GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char gl
    if(texFormat != GL_UNSIGNED_SHORT_5_6_5)
        glCompressedTexImage2DARB(GL_TEXTURE_2D,
                           0,
- 	                       texFormat,
- 	                       texW,
- 	                       texH,
- 	                       0,
- 	                       texSize,
- 	                       TEX0);
+                           texFormat,
+                           texW,
+                           texH,
+                           0,
+                           texSize,
+                           TEX0);
    else {
        fprintf(stderr, "%x\n", texFormat);
        glTexImage2D(GL_TEXTURE_2D,