Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
devnexen committed Sep 9, 2020
1 parent 0d128ab commit 62913b8
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/client/camera.cpp
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/client/clientenvironment.cpp
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/client/event_manager.h
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/client/localplayer.cpp
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions src/client/shader.cpp
Expand Up @@ -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

/*
Expand Down
1 change: 1 addition & 0 deletions src/client/sound_openal.cpp
Expand Up @@ -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>
Expand Down
File renamed without changes.

0 comments on commit 62913b8

Please sign in to comment.