diff options
| author | David CARLIER <devnexen@gmail.com> | 2020-09-09 18:12:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 19:12:03 +0200 |
| commit | 62913b872ea1b21a5aada55ed323476fbcea61dc (patch) | |
| tree | 6815ec0d5d242459486aeb5a406ce955eb85b09e | |
| parent | 0d128ab344e3d04d2b30dbd5e047f4ac700013b7 (diff) | |
| download | minetest-62913b872ea1b21a5aada55ed323476fbcea61dc.tar.gz minetest-62913b872ea1b21a5aada55ed323476fbcea61dc.tar.bz2 minetest-62913b872ea1b21a5aada55ed323476fbcea61dc.zip | |
Darwin platform build fix (#10376)
the event header seemingly being generic with libevent thus renaming it.
openal and opengl are deprecated on newer mac os releases thus suppressing the build warnings.
| -rw-r--r-- | src/client/camera.cpp | 2 | ||||
| -rw-r--r-- | src/client/clientenvironment.cpp | 2 | ||||
| -rw-r--r-- | src/client/event_manager.h | 2 | ||||
| -rw-r--r-- | src/client/localplayer.cpp | 2 | ||||
| -rw-r--r-- | src/client/shader.cpp | 5 | ||||
| -rw-r--r-- | src/client/sound_openal.cpp | 1 | ||||
| -rw-r--r-- | src/mtevent.h (renamed from src/event.h) | 0 |
7 files changed, 10 insertions, 4 deletions
diff --git a/src/client/camera.cpp b/src/client/camera.cpp index abc55e4b7..11f8a1c90 100644 --- a/src/client/camera.cpp +++ b/src/client/camera.cpp @@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "wieldmesh.h" #include "noise.h" // easeCurve #include "sound.h" -#include "event.h" +#include "mtevent.h" #include "nodedef.h" #include "util/numeric.h" #include "constants.h" diff --git a/src/client/clientenvironment.cpp b/src/client/clientenvironment.cpp index 895b0193c..0b7e92325 100644 --- a/src/client/clientenvironment.cpp +++ b/src/client/clientenvironment.cpp @@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "clientmap.h" #include "scripting_client.h" #include "mapblock_mesh.h" -#include "event.h" +#include "mtevent.h" #include "collision.h" #include "nodedef.h" #include "profiler.h" diff --git a/src/client/event_manager.h b/src/client/event_manager.h index 3762e89bf..16f7bcf07 100644 --- a/src/client/event_manager.h +++ b/src/client/event_manager.h @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once -#include "event.h" +#include "mtevent.h" #include <list> #include <map> diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp index 1e7040d57..f3eb1a2dd 100644 --- a/src/client/localplayer.cpp +++ b/src/client/localplayer.cpp @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "localplayer.h" #include <cmath> -#include "event.h" +#include "mtevent.h" #include "collision.h" #include "nodedef.h" #include "settings.h" diff --git a/src/client/shader.cpp b/src/client/shader.cpp index 0aba7b118..fc0a72319 100644 --- a/src/client/shader.cpp +++ b/src/client/shader.cpp @@ -45,7 +45,12 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <GLES2/gl2.h> #endif #else +#ifndef __APPLE__ #include <GL/gl.h> +#else +#define GL_SILENCE_DEPRECATION +#include <OpenGL/gl.h> +#endif #endif /* diff --git a/src/client/sound_openal.cpp b/src/client/sound_openal.cpp index c1c916e68..f4e61f93e 100644 --- a/src/client/sound_openal.cpp +++ b/src/client/sound_openal.cpp @@ -28,6 +28,7 @@ with this program; ifnot, write to the Free Software Foundation, Inc., #include <alc.h> //#include <alext.h> #elif defined(__APPLE__) + #define OPENAL_DEPRECATED #include <OpenAL/al.h> #include <OpenAL/alc.h> //#include <OpenAL/alext.h> diff --git a/src/event.h b/src/mtevent.h index 149f7eecd..149f7eecd 100644 --- a/src/event.h +++ b/src/mtevent.h |