Skip to content

Commit d6aaa6b

Browse files
Fix build errors on macOS 26. (isledecomp#728)
* Fix build errors on macOS 26. * Use OpenGLES for iOS, OpenGL for macOS. * Correct a typo in the target defines.
1 parent 4773686 commit d6aaa6b

File tree

4 files changed

+45
-0
lines changed

4 files changed

+45
-0
lines changed

miniwin/src/d3drm/backends/opengles2/renderer.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
#include "d3drmrenderer_opengles2.h"
22
#include "meshutils.h"
33

4+
#if defined(__APPLE__)
5+
#include <TargetConditionals.h>
6+
#if TARGET_OS_IOS
7+
#include <OpenGLES/ES2/gl.h>
8+
#include <OpenGLES/ES2/glext.h>
9+
#else
10+
#include <OpenGL/gl.h>
11+
#include <OpenGL/glext.h>
12+
#define GL_DEPTH_COMPONENT24_OES GL_DEPTH_COMPONENT24
13+
#define GL_DEPTH_COMPONENT32_OES GL_DEPTH_COMPONENT32
14+
#endif
15+
#else
416
#include <GLES2/gl2.h>
517
#include <GLES2/gl2ext.h>
18+
#endif
619
#include <SDL3/SDL.h>
720
#include <algorithm>
821
#include <string>

miniwin/src/d3drm/backends/opengles3/renderer.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
11
#include "d3drmrenderer_opengles3.h"
22
#include "meshutils.h"
33

4+
#if defined(__APPLE__)
5+
#include <TargetConditionals.h>
6+
#if TARGET_OS_IOS
7+
#include <OpenGLES/ES2/glext.h>
8+
#include <OpenGLES/ES3/gl.h>
9+
#else
10+
#include <OpenGL/gl.h>
11+
#include <OpenGL/glext.h>
12+
#define glBindVertexArray glBindVertexArrayAPPLE
13+
#define glGenVertexArrays glGenVertexArraysAPPLE
14+
#define glDeleteVertexArrays glDeleteVertexArraysAPPLE
15+
#endif
16+
#else
417
#include <GLES2/gl2ext.h>
518
#include <GLES3/gl3.h>
19+
#endif
620
#include <SDL3/SDL.h>
721
#include <algorithm>
822
#include <string>

miniwin/src/internal/d3drmrenderer_opengles2.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,16 @@
44
#include "d3drmtexture_impl.h"
55
#include "ddraw_impl.h"
66

7+
#if defined(__APPLE__)
8+
#include <TargetConditionals.h>
9+
#if TARGET_OS_IOS
10+
#include <OpenGLES/ES2/gl.h>
11+
#else
12+
#include <OpenGL/gl.h>
13+
#endif
14+
#else
715
#include <GLES2/gl2.h>
16+
#endif
817
#include <SDL3/SDL.h>
918
#include <vector>
1019

miniwin/src/internal/d3drmrenderer_opengles3.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,16 @@
44
#include "d3drmtexture_impl.h"
55
#include "ddraw_impl.h"
66

7+
#if defined(__APPLE__)
8+
#include <TargetConditionals.h>
9+
#if TARGET_OS_IOS
10+
#include <OpenGLES/ES3/gl.h>
11+
#else
12+
#include <OpenGL/gl.h>
13+
#endif
14+
#else
715
#include <GLES3/gl3.h>
16+
#endif
817
#include <SDL3/SDL.h>
918
#include <vector>
1019

0 commit comments

Comments
 (0)