3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update wxWidgets to 3.1.7

Browse source 
added handling for nanosvg with cmake
This commit is contained in:
tamasmeszaros 2022-06-08 12:25:01 +02:00 • committed by Lukas Matena
parent a8b10525e4
commit 9a7e024f78
11 changed files with 24 additions and 4451 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/BitmapCache.cpp
View file

@ -15,10 +15,8 @@
#include <wx/rawbmp.h>
#endif /* __WXGTK2__ */
//#define NANOSVG_IMPLEMENTATION
#include "nanosvg/nanosvg.h"
#define NANOSVGRAST_IMPLEMENTATION
#include "nanosvg/nanosvgrast.h"
#include <nanosvg/nanosvg.h>
#include <nanosvg/nanosvgrast.h>
namespace Slic3r { namespace GUI {

4
src/slic3r/GUI/GLTexture.cpp
View file

@ -23,8 +23,8 @@
#define STB_DXT_IMPLEMENTATION
#include "stb_dxt/stb_dxt.h"
#include "nanosvg/nanosvg.h"
#include "nanosvg/nanosvgrast.h"
#include <nanosvg/nanosvg.h>
#include <nanosvg/nanosvgrast.h>
#include "libslic3r/Utils.hpp"

5
src/slic3r/GUI/ImGuiWrapper.cpp
View file

@ -35,9 +35,8 @@
#include "GUI_App.hpp"
#include "../Utils/MacDarkMode.hpp"
#include "nanosvg/nanosvg.h"
#include "nanosvg/nanosvgrast.h"
#include <nanosvg/nanosvg.h>
#include <nanosvg/nanosvgrast.h>
namespace Slic3r {
namespace GUI {