Remove PreCompiled header from Common

project64 · Apr 12, 2021 · a48f8d1 · a48f8d1
1 parent 3482e0a
commit a48f8d1
Show file tree

Hide file tree

Showing 26 changed files with 37 additions and 55 deletions.
diff --git a/Source/Common/Common.vcxproj b/Source/Common/Common.vcxproj
@@ -31,6 +31,11 @@
   </ImportGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="CriticalSection.cpp" />
     <ClCompile Include="DateTimeClass.cpp" />
@@ -44,9 +49,6 @@
     <ClCompile Include="path.cpp" />
     <ClCompile Include="Platform.cpp" />
     <ClCompile Include="Random.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="StdString.cpp" />
     <ClCompile Include="SyncEvent.cpp" />
     <ClCompile Include="Thread.cpp" />
@@ -66,7 +68,6 @@
     <ClInclude Include="path.h" />
     <ClInclude Include="Platform.h" />
     <ClInclude Include="Random.h" />
-    <ClInclude Include="stdafx.h" />
     <ClInclude Include="StdString.h" />
     <ClInclude Include="stdtypes.h" />
     <ClInclude Include="SyncEvent.h" />

diff --git a/Source/Common/Common.vcxproj.filters b/Source/Common/Common.vcxproj.filters
@@ -11,9 +11,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="CriticalSection.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -67,9 +64,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="CriticalSection.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/Source/Common/CriticalSection.cpp b/Source/Common/CriticalSection.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "CriticalSection.h"
 #ifdef _WIN32
 #include <Windows.h>
 #endif

diff --git a/Source/Common/DateTimeClass.cpp b/Source/Common/DateTimeClass.cpp
@@ -1,4 +1,3 @@
-#include "stdafx.h"
 #include "DateTimeClass.h"
 #include <time.h>
 

diff --git a/Source/Common/DateTimeClass.h b/Source/Common/DateTimeClass.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+#include <string>
 
 class CDateTime
 {

diff --git a/Source/Common/FileClass.cpp b/Source/Common/FileClass.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "FileClass.h"
 #ifdef _WIN32
 #include <io.h>
 #define USE_WINDOWS_API

diff --git a/Source/Common/HighResTimeStamp.cpp b/Source/Common/HighResTimeStamp.cpp
@@ -1,4 +1,3 @@
-#include "stdafx.h"
 #include "HighResTimeStamp.h"
 #ifdef _WIN32
 #include <Windows.h>

diff --git a/Source/Common/IniFileClass.cpp b/Source/Common/IniFileClass.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "IniFileClass.h"
 #include <stdlib.h>
 #include <stdarg.h>
 

diff --git a/Source/Common/IniFileClass.h b/Source/Common/IniFileClass.h
@@ -4,7 +4,6 @@
 #include <strings.h>
 #endif
 
-#include "stdafx.h"
 #include "FileClass.h"
 #include "CriticalSection.h"
 #include <string>

diff --git a/Source/Common/LogClass.cpp b/Source/Common/LogClass.cpp
@@ -1,4 +1,5 @@
-#include "stdafx.h"
+#include "LogClass.h"
+#include "path.h"
 #include "Platform.h"
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/Source/Common/MemTest.cpp b/Source/Common/MemTest.cpp
@@ -1,5 +1,5 @@
-#include "stdafx.h"
 #include "MemTest.h"
+#include <map>
 
 #if defined(MEM_LEAK_TEST) && defined(_WIN32)
 

diff --git a/Source/Common/MemoryManagement.cpp b/Source/Common/MemoryManagement.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "MemoryManagement.h"
 #ifdef _WIN32
 #include <windows.h>
 #else

diff --git a/Source/Common/MemoryManagement.h b/Source/Common/MemoryManagement.h
@@ -12,4 +12,4 @@ void* AllocateAddressSpace(size_t size, void * base_address = 0);
 bool FreeAddressSpace(void* addr, size_t size);
 void* CommitMemory(void* addr, size_t size, MEM_PROTECTION memProtection);
 bool DecommitMemory(void* addr, size_t size);
-bool ProtectMemory(void* addr, size_t size, MEM_PROTECTION memProtection, MEM_PROTECTION * OldProtect = NULL);
+bool ProtectMemory(void* addr, size_t size, MEM_PROTECTION memProtection, MEM_PROTECTION * OldProtect = nullptr);
diff --git a/Source/Common/Platform.cpp b/Source/Common/Platform.cpp
@@ -1,4 +1,5 @@
-#include "stdafx.h"
+#include "Platform.h"
+#include <stdint.h>
 
 #ifndef _WIN32
 int _vscprintf(const char * format, va_list pargs)

diff --git a/Source/Common/Random.cpp b/Source/Common/Random.cpp
@@ -1,7 +1,6 @@
 // Implements the CRandom class
 // This class implements the Lehmer Random Number Generator
 
-#include "stdafx.h"
 #include "Random.h"
 #include <time.h>
 

diff --git a/Source/Common/StdString.cpp b/Source/Common/StdString.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "StdString.h"
 #include <malloc.h>
 #include <algorithm>
 #ifdef _WIN32

diff --git a/Source/Common/SyncEvent.cpp b/Source/Common/SyncEvent.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "SyncEvent.h"
 #ifdef _WIN32
 #include <Windows.h>
 #endif

diff --git a/Source/Common/Thread.cpp b/Source/Common/Thread.cpp
@@ -1,5 +1,6 @@
-#include "stdafx.h"
 #include "Thread.h"
+#include "Trace.h"
+#include "TraceModulesCommon.h"
 #ifdef _WIN32
 #include <Windows.h>
 #else

diff --git a/Source/Common/Trace.cpp b/Source/Common/Trace.cpp
@@ -1,5 +1,9 @@
-#include "stdafx.h"
-#include <Common/Thread.h>
+#include "Trace.h"
+#include "StdString.h"
+#include "CriticalSection.h"
+#include "Thread.h"
+#include <map>
+#include <vector>
 #ifdef _WIN32
 #include <Windows.h>
 #else
@@ -15,7 +19,7 @@ static ModuleNameMap g_ModuleNames;
 class CTraceLog
 {
     std::vector<CTraceModule *> m_Modules;
-    CriticalSection             m_CS;
+    CriticalSection m_CS;
 
 public:
     CTraceLog()

diff --git a/Source/Common/Util.cpp b/Source/Common/Util.cpp
@@ -1,5 +1,6 @@
-#include "stdafx.h"
 #include "Util.h"
+#include "StdString.h"
+#include "path.h"
 #ifdef _WIN32
 #include <windows.h>
 #include <Tlhelp32.h>

diff --git a/Source/Common/md5.cpp b/Source/Common/md5.cpp
@@ -38,8 +38,9 @@ These notices must be retained in any copies of any part of this
 documentation and/or software.
 
 */
-
-#include "stdafx.h"
+#include "md5.h"
+#include "Trace.h"
+#include "TraceModulesCommon.h"
 
 // MD5 simple initialization method
 MD5::MD5()

diff --git a/Source/Common/md5.h b/Source/Common/md5.h
@@ -46,6 +46,7 @@ documentation and/or software.
 #include <string>
 #include <functional>
 #include "path.h"
+#include "StdString.h"
 
 struct MD5Digest
 {

diff --git a/Source/Common/path.cpp b/Source/Common/path.cpp
@@ -1,6 +1,8 @@
-// Path.cpp: Implementation of the CPath class
+#include "path.h"
+#include "Trace.h"
+#include "TraceModulesCommon.h"
+#include "StdString.h"
 
-#include "stdafx.h"
 #ifdef _WIN32
 #pragma warning(push)
 #pragma warning(disable : 4091) // warning C4091: 'typedef ': ignored on left of 'tagGPFIDL_FLAGS' when no variable is declared

diff --git a/Source/Common/stdafx.cpp b/Source/Common/stdafx.cpp
diff --git a/Source/Common/stdafx.h b/Source/Common/stdafx.h
diff --git a/Source/Project64-core/N64System/Enhancement/EnhancementList.h b/Source/Project64-core/N64System/Enhancement/EnhancementList.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <Common/stdafx.h>
 #include <vector>
 #include <string>
 #include <Project64-core/N64System/Enhancement/Enhancement.h>