jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

glob: Hook in win32 implementation for _MSC_VER.

Browse source 
I'm flying blind here so I don't know if this will actually work, but
I copied the cmake part from src/strife.
This commit is contained in:
Simon Howard 2018-10-27 18:05:04 -04:00
parent f01ac84ab3
commit d676cd7af1
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/CMakeLists.txt
View file

@ -93,6 +93,11 @@ set(GAME_SOURCE_FILES
w_merge.c w_merge.h w_merge.c w_merge.h
z_zone.c z_zone.h) z_zone.c z_zone.h)
if(MSVC)
list(APPEND GAME_SOURCE_FILES
"../../win32/win_opendir.c" "../../win32/win_opendir.h")
endif()
set(DEHACKED_SOURCE_FILES set(DEHACKED_SOURCE_FILES
deh_defs.h deh_defs.h
deh_io.c deh_io.h deh_io.c deh_io.h

12
src/i_glob.c
View file

@ -16,16 +16,20 @@
// to be interrogated. // to be interrogated.
// //
// TODO: Merge win_opendir.[ch] into this file for MSVC implementation.
#include <stdlib.h> #include <stdlib.h>
#include "i_glob.h" #include "i_glob.h"
#include "m_misc.h" #include "m_misc.h"
#include "config.h" #include "config.h"
#ifdef HAVE_DIRENT_H // For Visual C++, we need to include the win_opendir module.
#include "dirent.h" #if defined(_MSC_VER)
#include <win_opendir.h>
#elif defined(HAVE_DIRENT_H)
#include <dirent.h>
#endif
#if defined(_MSC_VER) || defined(HAVE_DIRENT_H)
struct glob_s struct glob_s
{ {