fixup! Hide macos GL deprecation.
authorCarl Hetherington <cth@carlh.net>
Thu, 24 Dec 2020 19:39:35 +0000 (20:39 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 24 Dec 2020 19:39:35 +0000 (20:39 +0100)
src/wx/system_information_dialog.cc
wscript

index c1b904bd75cd51546f062a5b02c3e9e65d43f200..2d9044f6b27a950d96ad8f716379b117efaea675 100644 (file)
@@ -24,7 +24,6 @@
 #include "film_viewer.h"
 
 #ifdef DCPOMATIC_OSX
-#define GL_SILENCE_DEPRECATION 1
 #include <OpenGL/glu.h>
 #include <OpenGL/glext.h>
 #else
diff --git a/wscript b/wscript
index b7347471967089c5ff7b7b264ab597820cb325ec..ad1e137f22d24f23bc59f621b8615089dfa33ba6 100644 (file)
--- a/wscript
+++ b/wscript
@@ -199,7 +199,7 @@ def configure(conf):
 
     # OSX
     if conf.env.TARGET_OSX:
-        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX'])
+        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-DGL_SILENCE_DEPRECATION'])
         conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names')
 
     #