commit 5b3b1bbab6c49148b9309d0a9de0ef33e1a63513
Author: Max Waine <bobishmax@hotmail.com>
AuthorDate: Sun Dec 30 13:11:55 2018 +0000
Commit: Max Waine <bobishmax@hotmail.com>
CommitDate: Sun Dec 30 13:11:55 2018 +0000
Fix i_glob.c compilation under MSVC (and CMake)
This fixes issue #1109, which I have commented on.
---
src/CMakeLists.txt | 8 ++++----
src/i_glob.c | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 261683cc..d2a2a3ff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -127,7 +127,7 @@ else()
endif()
target_include_directories("${PROGRAM_PREFIX}doom"
- PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
+ PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../" "${PROJECT_SOURCE_DIR}/win32/")
target_link_libraries("${PROGRAM_PREFIX}doom" doom ${EXTRA_LIBS})
if(MSVC)
@@ -142,7 +142,7 @@ else()
endif()
target_include_directories("${PROGRAM_PREFIX}heretic"
- PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
+ PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../" "${PROJECT_SOURCE_DIR}/win32/")
target_link_libraries("${PROGRAM_PREFIX}heretic" heretic ${EXTRA_LIBS})
if(MSVC)
@@ -157,7 +157,7 @@ else()
endif()
target_include_directories("${PROGRAM_PREFIX}hexen"
- PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
+ PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../" "${PROJECT_SOURCE_DIR}/win32/")
target_link_libraries("${PROGRAM_PREFIX}hexen" hexen ${EXTRA_LIBS})
if(MSVC)
@@ -172,7 +172,7 @@ else()
endif()
target_include_directories("${PROGRAM_PREFIX}strife"
- PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../")
+ PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../" "${PROJECT_SOURCE_DIR}/win32/")
target_link_libraries("${PROGRAM_PREFIX}strife" strife ${EXTRA_LIBS})
if(MSVC)
diff --git a/src/i_glob.c b/src/i_glob.c
index 9df9b611..c3a57c03 100644
--- a/src/i_glob.c
+++ b/src/i_glob.c
@@ -27,6 +27,8 @@
#if defined(_MSC_VER)
// For Visual C++, we need to include the win_opendir module.
#include <win_opendir.h>
+#include <sys/stat.h>
+#define S_ISDIR(m) (((m)& S_IFMT) == S_IFDIR)
#elif defined(HAVE_DIRENT_H)
#include <dirent.h>
#include <sys/stat.h>