From 78282ea586a4cfbf16b57782c4905d751911e210 Mon Sep 17 00:00:00 2001 From: Paweł Kołodziejski Date: Sun, 15 Feb 2009 20:15:24 +0000 Subject: remove defines from msvc project files svn-id: r38286 --- dists/msvc9/sci.vcproj | 4 ++-- engines/sci/include/resource.h | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dists/msvc9/sci.vcproj b/dists/msvc9/sci.vcproj index 1407558547..ebd3ecc922 100644 --- a/dists/msvc9/sci.vcproj +++ b/dists/msvc9/sci.vcproj @@ -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" diff --git a/engines/sci/include/resource.h b/engines/sci/include/resource.h index cb6bc537ff..26a8318b76 100644 --- a/engines/sci/include/resource.h +++ b/engines/sci/include/resource.h @@ -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 -# include -# include # undef strcasecmp # undef strncasecmp # define strcasecmp _stricmp -- cgit v1.2.3