[Scummvm-cvs-logs] SF.net SVN: scummvm:[38286] scummvm/trunk
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Sun Feb 15 21:15:24 CET 2009
Revision: 38286
http://scummvm.svn.sourceforge.net/scummvm/?rev=38286&view=rev
Author: aquadran
Date: 2009-02-15 20:15:24 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
remove defines from msvc project files
Modified Paths:
--------------
scummvm/trunk/dists/msvc9/sci.vcproj
scummvm/trunk/engines/sci/include/resource.h
Modified: scummvm/trunk/dists/msvc9/sci.vcproj
===================================================================
--- scummvm/trunk/dists/msvc9/sci.vcproj 2009-02-15 20:02:43 UTC (rev 38285)
+++ scummvm/trunk/dists/msvc9/sci.vcproj 2009-02-15 20:15:24 UTC (rev 38286)
@@ -44,7 +44,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR"
+ PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -120,7 +120,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="../../;../../engines"
- PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_UNLINK;HAVE_RMDIR"
+ PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;SCUMMVM"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="0"
Modified: scummvm/trunk/engines/sci/include/resource.h
===================================================================
--- scummvm/trunk/engines/sci/include/resource.h 2009-02-15 20:02:43 UTC (rev 38285)
+++ scummvm/trunk/engines/sci/include/resource.h 2009-02-15 20:15:24 UTC (rev 38286)
@@ -59,12 +59,12 @@
#ifdef SCUMMVM
//TODO: Remove these defines by replacing their functionality by their ScummVM counterparts
-#ifndef _MSC_VER
-#define HAVE_UNISTD_H
-#define HAVE_FCNTL_H
+#define HAVE_MEMCHR
#define HAVE_UNLINK
#define HAVE_RMDIR
-#define HAVE_MEMCHR
+#define HAVE_FCNTL_H
+#ifndef _MSC_VER
+#define HAVE_UNISTD_H
#define HAVE_SYS_TIME_H
#define HAVE_GETTIMEOFDAY
#endif
@@ -107,9 +107,6 @@
#endif
#ifdef _MSC_VER
-//# include <sys/timeb.h>
-# include <fcntl.h>
-# include <windows.h>
# undef strcasecmp
# undef strncasecmp
# define strcasecmp _stricmp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list