[Scummvm-cvs-logs] scummvm-tools master -> 36abd20808c2db2e262a74b57ec0101b35c83e99

bluegr md5 at scummvm.org
Wed Feb 23 20:07:46 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
36abd20808 TOOLS: Fixed compilation with MSVC


Commit: 36abd20808c2db2e262a74b57ec0101b35c83e99
    https://github.com/scummvm/scummvm-tools/commit/36abd20808c2db2e262a74b57ec0101b35c83e99
Author: md5 (md5 at scummvm.org)
Date: 2011-02-23T11:07:01-08:00

Commit Message:
TOOLS: Fixed compilation with MSVC

Changed paths:
    common/file.cpp
    encode_dxa.cpp



diff --git a/common/file.cpp b/common/file.cpp
index e691c6f..a1ca46b 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -24,12 +24,25 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <assert.h>
-#ifndef _MSC_VER
-#include <sys/types.h>
 #include <sys/stat.h>   // for stat()
+#include <sys/types.h>
+#ifndef _MSC_VER
 #include <unistd.h>	// for unlink()
+#else
+
+// Add a definition for S_IFDIR for MSVC
+#ifndef S_ISDIR
+#ifndef S_IFDIR
+#ifndef _S_IFDIR
+#define S_IFDIR		(-1)
+#else
+#define S_IFDIR		_S_IFDIR
+#endif
+#endif
+#define S_ISDIR(m)	(((m)&S_IFDIR)==S_IFDIR)
 #endif
 
+#endif
 
 namespace Common {
 
diff --git a/encode_dxa.cpp b/encode_dxa.cpp
index 86235a9..af562c7 100644
--- a/encode_dxa.cpp
+++ b/encode_dxa.cpp
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <png.h>
+#include <zlib.h>
 
 #include "encode_dxa.h"
 #include "common/endian.h"






More information about the Scummvm-git-logs mailing list