TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Corrects recursive path dump so it can actually recurse correctly on linux. This fixes module/asset scan lookups

Browse source 
Also added logic to more correctly get the base path of executable, making it easier for certain debuggers, like on linux, to find the main.cs.
This commit is contained in:
Areloch 2020-12-15 11:04:15 -06:00
parent 484ad73719
commit 533ff28814
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Engine/source/cinterface/c_controlInterface.cpp
View file

@ -35,6 +35,9 @@ extern void createFontInit(void);
extern void createFontShutdown(void);
#endif
#if defined(TORQUE_SDL)
#include "SDL.h"
#endif
#if defined( TORQUE_MINIDUMP ) && defined( TORQUE_RELEASE )
extern S32 CreateMiniDump(LPEXCEPTION_POINTERS ExceptionInfo);
@ -227,7 +230,11 @@ extern "C" {
const char* torque_getexecutablepath()
{
#if defined(TORQUE_SDL)
return gExecutablePath ? gExecutablePath : SDL_GetBasePath();
#elif
return gExecutablePath;
#endif
}
void torque_setexecutablepath(const char* directory)
@ -236,4 +243,4 @@ extern "C" {
gExecutablePath = new char[pathLen];
dStrcpy(gExecutablePath, directory, pathLen);
}
}
}

9
Engine/source/platformX86UNIX/x86UNIXFileio.cpp
View file

@ -332,7 +332,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
}
//-----------------------------------------------------------------------------
static bool RecurseDumpPath(const char *path, const char* relativePath, const char *pattern, Vector<Platform::FileInfo> &fileVector)
static bool RecurseDumpPath(const char *path, const char* relativePath, const char *pattern, Vector<Platform::FileInfo> &fileVector, S32 currentDepth = 0, S32 recurseDepth = -1)
{
char search[1024];
@ -382,7 +382,8 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
relativePath, fEntry->d_name);
childRelative = childRelativeBuf;
}
RecurseDumpPath(child, childRelative, pattern, fileVector);
if (currentDepth < recurseDepth || recurseDepth == -1 )
RecurseDumpPath(child, childRelative, pattern, fileVector, currentDepth+1, recurseDepth);
}
else
{
@ -908,7 +909,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
{
char prefPathName[MaxPath];
MungePath(prefPathName, MaxPath, path, GetPrefDir());
RecurseDumpPath(prefPathName, path, pattern, fileVector);
RecurseDumpPath(prefPathName, path, pattern, fileVector, 0, depth);
}
// munge the requested path and dump it
@ -916,7 +917,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
char cwd[MaxPath];
getcwd(cwd, MaxPath);
MungePath(mungedPath, MaxPath, path, cwd);
return RecurseDumpPath(mungedPath, path, pattern, fileVector);
return RecurseDumpPath(mungedPath, path, pattern, fileVector, 0, depth);
}
//-----------------------------------------------------------------------------