#5566: Linux compilation

codereader · Apr 9, 2021 · 30f0996 · 30f0996
1 parent 945fbcb
commit 30f0996
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/radiant/ui/materials/editor/MaterialEditor.cpp b/radiant/ui/materials/editor/MaterialEditor.cpp
@@ -271,7 +271,12 @@ void MaterialEditor::setupPreviewLightProperties(wxWindow* previewPanel)
         _preview->setLightClassname(ev.GetString().ToStdString());
     });
 
-    getControl<wxColourPickerCtrl>("MaterialPreviewLightColour")->Bind(wxEVT_COLOURPICKER_CURRENT_CHANGED,
+#if defined(__WXMSW__) && wxCHECK_VERSION(3,1,3)
+    const auto& colourEvtType = wxEVT_COLOURPICKER_CURRENT_CHANGED;
+#else
+    const auto& colourEvtType = wxEVT_COLOURPICKER_CHANGED;
+#endif
+    getControl<wxColourPickerCtrl>("MaterialPreviewLightColour")->Bind(colourEvtType,
     [this](wxColourPickerEvent& ev)
     {
         if (_lightUpdateInProgress) return;

diff --git a/radiantcore/rendersystem/backend/glprogram/GLSLDepthFillAlphaProgram.cpp b/radiantcore/rendersystem/backend/glprogram/GLSLDepthFillAlphaProgram.cpp
@@ -1,5 +1,6 @@
 #include "GLSLDepthFillAlphaProgram.h"
 
+#include "GLProgramAttributes.h"
 #include "../GLProgramFactory.h"
 #include "debugging/gl.h"