luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code 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

12
include/coreutil.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __IRR_CORE_UTIL_H_INCLUDED__
#define __IRR_CORE_UTIL_H_INCLUDED__
#ifndef IRR_CORE_UTIL_H_INCLUDED
#define IRR_CORE_UTIL_H_INCLUDED
#include "irrString.h"
#include "path.h"
@@ -177,15 +177,15 @@ static inline io::path mergeFilename(const io::path& path, const io::path& filen
if ( !result.empty() )
{
fschar_t last = result.lastChar();
if ( last != _IRR_TEXT('/') && last != _IRR_TEXT('\\') )
result += _IRR_TEXT('/');
if ( last != IRR_TEXT('/') && last != IRR_TEXT('\\') )
result += IRR_TEXT('/');
}
if ( !filename.empty() )
result += filename;
if ( !extension.empty() )
{
if ( !result.empty() && extension[0] != _IRR_TEXT('.') )
result += _IRR_TEXT('.');
if ( !result.empty() && extension[0] != IRR_TEXT('.') )
result += IRR_TEXT('.');
result += extension;
}