[OMPT-svn-commit] SF.net SVN: modplug:[3224] trunk/OpenMPT

[<man...@us...>]

Revision: 3224
          http://sourceforge.net/p/modplug/code/3224
Author:   manxorist
Date:     2013-11-14 22:37:30 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
[Ref] Move windows.h include near the other windows related includes in stdafx.h.
[Ref] Rework handling of NO_WINDOWS_H into BuildSettings.h.
[Fix] Add shlwapi.h to stdafx.h. VS2008 SDK needs this for PathFileExistsW.

Modified Paths:
--------------
    trunk/OpenMPT/common/BuildSettings.h
    trunk/OpenMPT/common/stdafx.h
    trunk/OpenMPT/common/typedefs.h
    trunk/OpenMPT/unarchiver/unarchiver.cpp

Modified: trunk/OpenMPT/common/BuildSettings.h
===================================================================
--- trunk/OpenMPT/common/BuildSettings.h	2013-11-14 21:45:54 UTC (rev 3223)
+++ trunk/OpenMPT/common/BuildSettings.h	2013-11-14 22:37:30 UTC (rev 3224)
@@ -240,7 +240,8 @@
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NO_WINDOWS_H)
+
 #if MPT_COMPILER_MSVC && MPT_MSVC_AT_LEAST(2010,0)
 #define _WIN32_WINNT        0x0501 // _WIN32_WINNT_WINXP
 #else

Modified: trunk/OpenMPT/common/stdafx.h
===================================================================
--- trunk/OpenMPT/common/stdafx.h	2013-11-14 21:45:54 UTC (rev 3223)
+++ trunk/OpenMPT/common/stdafx.h	2013-11-14 22:37:30 UTC (rev 3224)
@@ -25,7 +25,9 @@
 #include <afxdlgs.h>
 #include <afxole.h>
 
+#include <windows.h>
 #include <windowsx.h>
+#include <shlwapi.h>
 
 #if MPT_COMPILER_MSVC
 #pragma warning(disable:4201)

Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h	2013-11-14 21:45:54 UTC (rev 3223)
+++ trunk/OpenMPT/common/typedefs.h	2013-11-14 22:37:30 UTC (rev 3224)
@@ -332,15 +332,8 @@
 
 
 
-#if defined(_WIN32) && !defined(NO_WINDOWS_H)
+#if !defined(WIN32)
 
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h> // defines WIN32
-
-#else // !_WIN32
-
 // openmpt assumes these type have exact WIN32 semantics
 
 typedef std::int32_t  BOOL;
@@ -361,7 +354,7 @@
 #define TRUE (1)
 #define FALSE (0)
 
-#endif // _WIN32
+#endif // !WIN32
 
 
 

Modified: trunk/OpenMPT/unarchiver/unarchiver.cpp
===================================================================
--- trunk/OpenMPT/unarchiver/unarchiver.cpp	2013-11-14 21:45:54 UTC (rev 3223)
+++ trunk/OpenMPT/unarchiver/unarchiver.cpp	2013-11-14 22:37:30 UTC (rev 3224)
@@ -9,8 +9,6 @@
 
 #include "stdafx.h"
 
-#include <Windows.h>
-
 #include "unarchiver.h"
 #include "../soundlib/FileReader.h"
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.