diff --git a/CMakeLists.txt b/CMakeLists.txt index 88bbf5721..f0be21c21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,7 +160,7 @@ if(WIN32) list(APPEND VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-fd.c ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-dirent.c) file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/windows/*.c) source_group("Windows-specific code" FILES ${OS_SRC}) -else() +elseif(UNIX) add_definitions(-DUSE_PTHREADS) if(CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/src/util/vfs.h b/src/util/vfs.h index f12c12fdd..bf0e99434 100644 --- a/src/util/vfs.h +++ b/src/util/vfs.h @@ -8,13 +8,12 @@ #include "util/common.h" -#ifndef _WIN32 -#include -#define PATH_SEP "/" -#else +#ifdef _WIN32 #include #include #define PATH_SEP "\\" +#else +#define PATH_SEP "/" #endif #ifndef PATH_MAX diff --git a/src/util/vfs/vfs-fd.c b/src/util/vfs/vfs-fd.c index f3646c6c8..9487f501f 100644 --- a/src/util/vfs/vfs-fd.c +++ b/src/util/vfs/vfs-fd.c @@ -7,6 +7,9 @@ #include #include +#ifndef _WIN32 +#include +#endif struct VFileFD { struct VFile d;