Browse Source

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.
David CARLIER 3 năm trước cách đây
mục cha
commit
62913b872e

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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>
 

+ 1 - 1
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"

+ 5 - 0
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
 
 /*

+ 1 - 0
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>

+ 0 - 0
src/event.h → src/mtevent.h