Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,4 @@ TheForceEngine/tfelnx

# Ignore dumps
*.dmp
.DS_Store
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ if(ENABLE_TFE)
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
find_package(PkgConfig REQUIRED)

pkg_check_modules(SDL2 REQUIRED sdl2)
pkg_check_modules(SDL2_IMAGE REQUIRED SDL2_image)

Expand Down
3 changes: 0 additions & 3 deletions TheForceEngine/TFE_FileSystem/fileutil-posix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ namespace FileUtil
}

#else // Linux

void getExecutionDirectory(char *dir)
{
char exe[PATH_MAX], *c;
Expand Down Expand Up @@ -386,13 +385,11 @@ namespace FileUtil
TFE_System::logWrite(LOG_WARNING, "getModifiedTime", "stat(%s) failed with %d\n", path, errno);
return (u64)-1; // revisit
}

#ifdef __APPLE__
mtim = (u64)st.st_mtimespec.tv_sec * 10000 + (u64)((double)st.st_mtimespec.tv_nsec / 100.0);
#else
mtim = (u64)st.st_mtim.tv_sec * 10000 + (u64)((double)st.st_mtim.tv_nsec / 100.0);
#endif

return mtim;
}

Expand Down
4 changes: 4 additions & 0 deletions TheForceEngine/TFE_FileSystem/paths-posix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,11 @@ namespace TFE_Paths
{
char p[TFE_MAX_PATH];
memset(p, 0, TFE_MAX_PATH);
#ifdef __APPLE__
FileUtil::getExecutionDirectory(p);
#else
FileUtil::getCurrentDirectory(p);
#endif
s_paths[PATH_PROGRAM] = p;
s_paths[PATH_PROGRAM] += "/";
return true;
Expand Down
Loading