minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-07-05 17:50:24 +02:00
Code Issues Projects Releases Wiki Activity

Merging r6256 from trunk to ogl-es branch

Browse Source 
(fixing OSX again)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6257 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:20:42 +00:00
parent ee3579015b
commit 1efc93d766
196 changed files with 832 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/GUIEditor/CMemoryReadWriteFile.h
View File

@ -56,7 +56,7 @@ namespace io
virtual const io::path& getFileName() const;
//! Flush the content of the buffer in the file
virtual bool flush() _IRR_OVERRIDE_;
virtual bool flush() IRR_OVERRIDE;
//! Returns file data as an array
core::array<c8>& getData();

6
tools/IrrFontTool/newFontTool/CFontTool.h
View File

@ -1,5 +1,5 @@
#ifndef __IRR_FONT_TOOL_INCLUDED__
#define __IRR_FONT_TOOL_INCLUDED__
#ifndef IRR_FONT_TOOL_INCLUDED
#define IRR_FONT_TOOL_INCLUDED
#include "irrlicht.h"
@ -75,4 +75,4 @@ namespace irr {
};
}
#endif // __IRR_FONT_TOOL_INCLUDED__
#endif // IRR_FONT_TOOL_INCLUDED