haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove universal include of wx.h in 3d viewer OpenGL file

This commit is contained in:
Ian McInerney 2021-06-03 02:29:09 +01:00
parent d79dd39be3
commit d56251fdac
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3d-viewer/3d_rendering/legacy/3d_model.cpp
View File

@ -35,6 +35,7 @@
#include "../common_ogl/ogl_utils.h" #include "../common_ogl/ogl_utils.h"
#include "../3d_math.h" #include "../3d_math.h"
#include <wx/debug.h> #include <wx/debug.h>
#include <wx/log.h>
#include <chrono> #include <chrono>
#include <memory> #include <memory>

2
3d-viewer/3d_rendering/legacy/3d_model.h
View File

@ -37,6 +37,8 @@
#include "../3d_render_raytracing/shapes3D/bbox_3d.h" #include "../3d_render_raytracing/shapes3D/bbox_3d.h"
#include "../../3d_enums.h" #include "../../3d_enums.h"
#include <wx/chartype.h>
class MODEL_3D class MODEL_3D
{ {
public: public:

2
3d-viewer/common_ogl/openGL_includes.h
View File

@ -30,8 +30,6 @@
#ifndef OPENGL_INCLUDES_H #ifndef OPENGL_INCLUDES_H
#define OPENGL_INCLUDES_H #define OPENGL_INCLUDES_H
#include <wx/wx.h>
#ifdef __APPLE__ #ifdef __APPLE__
// Apple, in their infinite wisdom, has decided to mark OpenGL as deprecated. // Apple, in their infinite wisdom, has decided to mark OpenGL as deprecated.
// Luckily we can silence warnings about its deprecation. // Luckily we can silence warnings about its deprecation.