removed some unneeded #includes, small cleanup

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2365 10f7b99b-c216-0410-bff0-8a66a9350fd8

10 files changed, 30 insertions, 28 deletions

diff --git a/src/ui/CmdUI/CmdUI.vcproj b/src/ui/CmdUI/CmdUI.vcproj
index d436ec498..fc685f57f 100644
--- a/src/ui/CmdUI/CmdUI.vcproj
+++ b/src/ui/CmdUI/CmdUI.vcproj
@@ -44,7 +44,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -100,7 +100,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

diff --git a/src/ui/CmdUI/stdafx.h b/src/ui/CmdUI/stdafx.h
index 2dd78ef24..efe43900a 100644
--- a/src/ui/CmdUI/stdafx.h
+++ b/src/ui/CmdUI/stdafx.h
@@ -1,15 +1,14 @@
 #pragma once

 

-#include "../../DSUtil/SharedInclude.h"

-

-

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit

-#define WINVER				0x0600

+#ifndef WINVER

+#define WINVER			0x0600

+#endif

 

 #ifndef VC_EXTRALEAN

 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers

 #endif

 

 #include <afx.h>

-#include <afxwin.h>         // MFC core and standard components

+#include <afxwin.h>			// MFC core and standard components

diff --git a/src/ui/LCDUI/LCDUI.vcproj b/src/ui/LCDUI/LCDUI.vcproj
index 0d2beaee2..37e821ffc 100644
--- a/src/ui/LCDUI/LCDUI.vcproj
+++ b/src/ui/LCDUI/LCDUI.vcproj
@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -101,7 +101,7 @@
 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\include"

-				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

diff --git a/src/ui/ResizableLib/ResizableLib.vcproj b/src/ui/ResizableLib/ResizableLib.vcproj
index 47eca46da..411534c1a 100644
--- a/src/ui/ResizableLib/ResizableLib.vcproj
+++ b/src/ui/ResizableLib/ResizableLib.vcproj
@@ -44,7 +44,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -100,7 +100,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -156,7 +156,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -212,7 +212,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"

+				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"

 				EnableEnhancedInstructionSet="0"

 			/>

 			<Tool

diff --git a/src/ui/ResizableLib/ResizableLib.vcxproj b/src/ui/ResizableLib/ResizableLib.vcxproj
index 300a88750..b8f9b76c2 100644
--- a/src/ui/ResizableLib/ResizableLib.vcxproj
+++ b/src/ui/ResizableLib/ResizableLib.vcxproj
@@ -88,7 +88,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ClCompile>

     <Lib>

       <TargetMachine>MachineX86</TargetMachine>

@@ -100,7 +100,7 @@
     </Midl>

     <ClCompile>

       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

-      <PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

     </ClCompile>

     <Lib>

@@ -110,7 +110,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ClCompile>

     <Lib>

       <TargetMachine>MachineX86</TargetMachine>

@@ -122,7 +122,7 @@
     </Midl>

     <ClCompile>

       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

-      <PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

     </ClCompile>

     <Lib>

diff --git a/src/ui/ResizableLib/stdafx.h b/src/ui/ResizableLib/stdafx.h
index 84f645a05..6e8c53458 100644
--- a/src/ui/ResizableLib/stdafx.h
+++ b/src/ui/ResizableLib/stdafx.h
@@ -1,16 +1,16 @@
 #pragma once

 

-#include "../../dsutil/SharedInclude.h"

-

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit

-#define WINVER				0x0600

+#ifndef WINVER

+#define WINVER			0x0600

+#endif

 

 #ifndef VC_EXTRALEAN

 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers

 #endif

 

 #include <afx.h>

-#include <afxwin.h>         // MFC core and standard components

+#include <afxwin.h>			// MFC core and standard components

 #include <afxcmn.h>

 #include <afxdlgs.h>

diff --git a/src/ui/TreePropSheet/TreePropSheet.vcproj b/src/ui/TreePropSheet/TreePropSheet.vcproj
index d95621e6a..53ea41459 100644
--- a/src/ui/TreePropSheet/TreePropSheet.vcproj
+++ b/src/ui/TreePropSheet/TreePropSheet.vcproj
@@ -44,7 +44,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -100,7 +100,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

diff --git a/src/ui/TreePropSheet/stdafx.h b/src/ui/TreePropSheet/stdafx.h
index ffbbcd778..634b9ef64 100644
--- a/src/ui/TreePropSheet/stdafx.h
+++ b/src/ui/TreePropSheet/stdafx.h
@@ -4,11 +4,13 @@
 

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit

-#define WINVER				0x0600

+#ifndef WINVER

+#define WINVER			0x0600

+#endif

 

 #ifndef VC_EXTRALEAN

 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers

 #endif

 

 #include <afx.h>

-#include <afxwin.h>         // MFC core and standard components

+#include <afxwin.h>			// MFC core and standard components

diff --git a/src/ui/sizecbar/sizecbar.vcproj b/src/ui/sizecbar/sizecbar.vcproj
index f8db30c4c..e28673284 100644
--- a/src/ui/sizecbar/sizecbar.vcproj
+++ b/src/ui/sizecbar/sizecbar.vcproj
@@ -44,7 +44,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -100,7 +100,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

diff --git a/src/ui/sizecbar/stdafx.h b/src/ui/sizecbar/stdafx.h
index ac9cd9456..14863f705 100644
--- a/src/ui/sizecbar/stdafx.h
+++ b/src/ui/sizecbar/stdafx.h
@@ -1,9 +1,10 @@
 #pragma once

-#include "../../DSUtil/SharedInclude.h"

 

 #define WIN32_LEAN_AND_MEAN					// Exclude rarely-used stuff from Windows headers

 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit

+#ifndef WINVER

 #define WINVER			0x0600

+#endif

 

 #ifndef VC_EXTRALEAN

 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers