Skip to content

Commit 62913b8

Browse files
authoredSep 9, 2020
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.
1 parent 0d128ab commit 62913b8

File tree

7 files changed

+10
-4
lines changed

7 files changed

+10
-4
lines changed
 

Diff for: ‎src/client/camera.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
3030
#include "wieldmesh.h"
3131
#include "noise.h" // easeCurve
3232
#include "sound.h"
33-
#include "event.h"
33+
#include "mtevent.h"
3434
#include "nodedef.h"
3535
#include "util/numeric.h"
3636
#include "constants.h"

Diff for: ‎src/client/clientenvironment.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2525
#include "clientmap.h"
2626
#include "scripting_client.h"
2727
#include "mapblock_mesh.h"
28-
#include "event.h"
28+
#include "mtevent.h"
2929
#include "collision.h"
3030
#include "nodedef.h"
3131
#include "profiler.h"

Diff for: ‎src/client/event_manager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
1919

2020
#pragma once
2121

22-
#include "event.h"
22+
#include "mtevent.h"
2323
#include <list>
2424
#include <map>
2525

Diff for: ‎src/client/localplayer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
1919

2020
#include "localplayer.h"
2121
#include <cmath>
22-
#include "event.h"
22+
#include "mtevent.h"
2323
#include "collision.h"
2424
#include "nodedef.h"
2525
#include "settings.h"

Diff for: ‎src/client/shader.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
4545
#include <GLES2/gl2.h>
4646
#endif
4747
#else
48+
#ifndef __APPLE__
4849
#include <GL/gl.h>
50+
#else
51+
#define GL_SILENCE_DEPRECATION
52+
#include <OpenGL/gl.h>
53+
#endif
4954
#endif
5055

5156
/*

Diff for: ‎src/client/sound_openal.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ with this program; ifnot, write to the Free Software Foundation, Inc.,
2828
#include <alc.h>
2929
//#include <alext.h>
3030
#elif defined(__APPLE__)
31+
#define OPENAL_DEPRECATED
3132
#include <OpenAL/al.h>
3233
#include <OpenAL/alc.h>
3334
//#include <OpenAL/alext.h>

Diff for: ‎src/event.h renamed to ‎src/mtevent.h

File renamed without changes.

0 commit comments

Comments
 (0)
Please sign in to comment.