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.master
parent
0d128ab344
commit
62913b872e
|
@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#include "wieldmesh.h"
|
#include "wieldmesh.h"
|
||||||
#include "noise.h" // easeCurve
|
#include "noise.h" // easeCurve
|
||||||
#include "sound.h"
|
#include "sound.h"
|
||||||
#include "event.h"
|
#include "mtevent.h"
|
||||||
#include "nodedef.h"
|
#include "nodedef.h"
|
||||||
#include "util/numeric.h"
|
#include "util/numeric.h"
|
||||||
#include "constants.h"
|
#include "constants.h"
|
||||||
|
|
|
@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#include "clientmap.h"
|
#include "clientmap.h"
|
||||||
#include "scripting_client.h"
|
#include "scripting_client.h"
|
||||||
#include "mapblock_mesh.h"
|
#include "mapblock_mesh.h"
|
||||||
#include "event.h"
|
#include "mtevent.h"
|
||||||
#include "collision.h"
|
#include "collision.h"
|
||||||
#include "nodedef.h"
|
#include "nodedef.h"
|
||||||
#include "profiler.h"
|
#include "profiler.h"
|
||||||
|
|
|
@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "event.h"
|
#include "mtevent.h"
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
|
||||||
#include "localplayer.h"
|
#include "localplayer.h"
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include "event.h"
|
#include "mtevent.h"
|
||||||
#include "collision.h"
|
#include "collision.h"
|
||||||
#include "nodedef.h"
|
#include "nodedef.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
|
|
@ -45,7 +45,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#include <GLES2/gl2.h>
|
#include <GLES2/gl2.h>
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
|
#ifndef __APPLE__
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
|
#else
|
||||||
|
#define GL_SILENCE_DEPRECATION
|
||||||
|
#include <OpenGL/gl.h>
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -28,6 +28,7 @@ with this program; ifnot, write to the Free Software Foundation, Inc.,
|
||||||
#include <alc.h>
|
#include <alc.h>
|
||||||
//#include <alext.h>
|
//#include <alext.h>
|
||||||
#elif defined(__APPLE__)
|
#elif defined(__APPLE__)
|
||||||
|
#define OPENAL_DEPRECATED
|
||||||
#include <OpenAL/al.h>
|
#include <OpenAL/al.h>
|
||||||
#include <OpenAL/alc.h>
|
#include <OpenAL/alc.h>
|
||||||
//#include <OpenAL/alext.h>
|
//#include <OpenAL/alext.h>
|
||||||
|
|
Loading…
Reference in New Issue