TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'bpay/clang-cl-build-fixes' into development

Browse source 
Conflicts:
	Engine/source/T3D/shapeBase.h
This commit is contained in:
Daniel Buckmaster 2015-07-17 16:55:12 +10:00
commit c2e5dc3345
17 changed files with 40 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/platformWin32/winFileio.cpp
View file

@ -1411,9 +1411,9 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve
if( ( subPath && ( dStrncmp( subPath, "", 1 ) != 0 ) ))
{
if( subTrail == '/' )
dSprintf(search, search.size, "%s%s", subPath, fileName);
dSprintf(search, search.size, "%s%s", subPath, fileName.ptr);
else
dSprintf(search, search.size, "%s/%s", subPath, fileName);
dSprintf(search, search.size, "%s/%s", subPath, fileName.ptr);
char* child = search;
if( currentDepth < recurseDepth || recurseDepth == -1 )
@ -1427,7 +1427,7 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve
child = fileName;
else
{
dSprintf(search, search.size, "/%s", fileName);
dSprintf(search, search.size, "/%s", fileName.ptr);
child = search;
}