diff --git a/stepmania/src/smpackage-net2003.vcproj b/stepmania/src/smpackage-net2003.vcproj index 4966d0928d..9b521fd410 100644 --- a/stepmania/src/smpackage-net2003.vcproj +++ b/stepmania/src/smpackage-net2003.vcproj @@ -26,7 +26,7 @@ AdditionalIncludeDirectories=".;lua-5.0\include" PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;_WINDOWS;WINDOWS;SMPACKAGE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="global.h" PrecompiledHeaderFile=".\Debug-smpackage/smpackage.pch" @@ -90,7 +90,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=".;" + AdditionalIncludeDirectories=".;lua-5.0\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINDOWS;SMPACKAGE" StringPooling="TRUE" RuntimeLibrary="2" diff --git a/stepmania/src/smpackage/StdAfx.h b/stepmania/src/smpackage/StdAfx.h index 2ac2b39712..a44f6667c9 100644 --- a/stepmania/src/smpackage/StdAfx.h +++ b/stepmania/src/smpackage/StdAfx.h @@ -14,6 +14,12 @@ #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers +// prevent windows includes from pulling in debug CRTs: +#if defined(_DEBUG) +#undef _DEBUG +#define RESTORE_DEBUG +#endif + #include // MFC core and standard components #include // MFC extensions #include // MFC support for Internet Explorer 4 Common Controls @@ -21,6 +27,11 @@ #include // MFC support for Windows Common Controls #endif // _AFX_NO_AFXCMN_SUPPORT +#if defined(RESTORE_DEBUG) +#undef RESTORE_DEBUG +#define _DEBUG +#endif + #include using namespace std; diff --git a/stepmania/src/smpackage/ZipArchive/StdAfx.h b/stepmania/src/smpackage/ZipArchive/StdAfx.h index 5d0ffb6dc2..86ee9ab7c4 100644 --- a/stepmania/src/smpackage/ZipArchive/StdAfx.h +++ b/stepmania/src/smpackage/ZipArchive/StdAfx.h @@ -38,10 +38,20 @@ #define ZIP_ARCHIVE_MFC +#if defined(_DEBUG) +#undef _DEBUG +#define RESTORE_DEBUG +#endif + #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers #include #include +#if defined(RESTORE_DEBUG) +#undef RESTORE_DEBUG +#define _DEBUG +#endif + //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. diff --git a/stepmania/src/smpackage/ZipArchive/ZipArchive-net2003.vcproj b/stepmania/src/smpackage/ZipArchive/ZipArchive-net2003.vcproj index 8ade4b618e..174388a48a 100644 --- a/stepmania/src/smpackage/ZipArchive/ZipArchive-net2003.vcproj +++ b/stepmania/src/smpackage/ZipArchive/ZipArchive-net2003.vcproj @@ -25,7 +25,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;ZLIB_DLL;WIN32;_WINDOWS;ZIP_ARCHIVE_MFC_PROJ;PKZIP_BUG_WORKAROUND" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" UsePrecompiledHeader="2" PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\Debug/ZipArchive.pch"