Common: added defines utime for Linux build

xrCore: hidden under define functions of file dialogs
OpenXRay · May 24, 2018 · d7447ef · d7447ef
1 parent 51f9706
commit d7447ef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl
@@ -238,6 +238,8 @@ inline int _filelength(int fd)
 #undef max
 #define __max(a, b) std::max(a, b)
 #define __min(a, b) std::min(a, b)
+#define _utime utime
+#define _utimbuf utimbuf
 
 #define xr_itoa SDL_itoa
 

diff --git a/src/xrCore/FileSystem.cpp b/src/xrCore/FileSystem.cpp
@@ -122,6 +122,7 @@ bool EFS_Utils::GetOpenNameInternal(
     LPCSTR initial, LPSTR buffer, int sz_buf, bool bMulti, LPCSTR offset, int start_flt_ext)
 {
     VERIFY(buffer && (sz_buf > 0));
+#if defined(WINDOWS)
     FS_Path& P = *FS.get_path(initial);
     string1024 flt;
     MakeFilter(flt, P.m_FilterCaption ? P.m_FilterCaption : "", P.m_DefExt);
@@ -179,6 +180,7 @@ bool EFS_Utils::GetOpenNameInternal(
         case FNERR_BUFFERTOOSMALL: Log("Too many files selected."); break;
         }
     }
+
     if (bRes && bMulti)
     {
         Log("buff=", buffer);
@@ -206,13 +208,16 @@ bool EFS_Utils::GetOpenNameInternal(
     }
     xr_strlwr(buffer);
     return bRes;
+#else
+    return true;
+#endif
 }
 
 bool EFS_Utils::GetSaveName(LPCSTR initial, string_path& buffer, LPCSTR offset, int start_flt_ext)
 {
     // unsigned int dwVersion = GetVersion();
     // unsigned int dwWindowsMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
-
+#if defined(WINDOWS)
     FS_Path& P = *FS.get_path(initial);
     string1024 flt;
 
@@ -269,6 +274,9 @@ bool EFS_Utils::GetSaveName(LPCSTR initial, string_path& buffer, LPCSTR offset,
     }
     xr_strlwr(buffer);
     return bRes;
+#else
+    return true;
+#endif
 }
 //----------------------------------------------------
 LPCSTR EFS_Utils::AppendFolderToName(LPSTR tex_name, u32 const tex_name_size, int depth, BOOL full_name)