AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix compilation against libc++

This commit is contained in:
Jack Andersen 2019-04-06 19:03:23 -10:00
parent 8ba5cf9a8b
commit 7b5dce54af
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
specter/include/specter/FontCache.hpp
View File

@ -148,7 +148,7 @@ class FontCache {
const hecl::Runtime::FileStoreManager& m_fileMgr; const hecl::Runtime::FileStoreManager& m_fileMgr;
hecl::SystemString m_cacheRoot; hecl::SystemString m_cacheRoot;
struct Library { struct Library {
FT_Library m_lib; FT_Library m_lib = nullptr;
Library(); Library();
~Library(); ~Library();
operator FT_Library() { return m_lib; } operator FT_Library() { return m_lib; }

3
specter/include/specter/RootView.hpp
View File

@ -108,7 +108,10 @@ public:
void destroyed(); void destroyed();
bool isDestroyed() const { return m_destroyed; } bool isDestroyed() const { return m_destroyed; }
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
void resized(const boo::SWindowRect& rect, bool) { resized(rect, rect); } void resized(const boo::SWindowRect& rect, bool) { resized(rect, rect); }
#pragma GCC diagnostic pop
void resized(const boo::SWindowRect& rootView, const boo::SWindowRect& sub); void resized(const boo::SWindowRect& rootView, const boo::SWindowRect& sub);
void mouseDown(const boo::SWindowCoord& coord, boo::EMouseButton button, boo::EModifierKey mods); void mouseDown(const boo::SWindowCoord& coord, boo::EMouseButton button, boo::EModifierKey mods);
void mouseUp(const boo::SWindowCoord& coord, boo::EMouseButton button, boo::EModifierKey mods); void mouseUp(const boo::SWindowCoord& coord, boo::EMouseButton button, boo::EModifierKey mods);

2
specter/include/specter/ViewResources.hpp
View File

@ -177,9 +177,7 @@ public:
ViewResources() = default; ViewResources() = default;
ViewResources(const ViewResources& other) = delete; ViewResources(const ViewResources& other) = delete;
ViewResources(ViewResources&& other) = default;
ViewResources& operator=(const ViewResources& other) = delete; ViewResources& operator=(const ViewResources& other) = delete;
ViewResources& operator=(ViewResources&& other) = default;
void updateBuffers() { void updateBuffers() {
m_viewRes.updateBuffers(); m_viewRes.updateBuffers();

2
specter/zeus

@ -1 +1 @@
Subproject commit 617875531acd375e77f142fdb04fd219162c1237 Subproject commit 92733a3bb7c62f26bbcc0dfaf89be11636288b7f