Remove special rules for Windows.h and library includes
This commit is contained in:
		| @@ -46,14 +46,10 @@ DerivePointerAlignment: false | |||||||
| DisableFormat:   false | DisableFormat:   false | ||||||
| ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ] | ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ] | ||||||
| IncludeCategories: | IncludeCategories: | ||||||
|   - Regex:           '^\<[wW]indows.h\>' |   - Regex:           '^\<[^Q][^/.>]*\>' | ||||||
|     Priority:        -3 |  | ||||||
|   - Regex:           '^\<(boost|catch|dynarmic|glad|inih|nihstro)/' |  | ||||||
|     Priority:        -1 |  | ||||||
|   - Regex:           '^\<(SDL|SoundTouch|Q)' |  | ||||||
|     Priority:        -1 |  | ||||||
|   - Regex:           '^\<' |  | ||||||
|     Priority:        -2 |     Priority:        -2 | ||||||
|  |   - Regex:           '^\<' | ||||||
|  |     Priority:        -1 | ||||||
|   - Regex:           '^\"' |   - Regex:           '^\"' | ||||||
|     Priority:        0 |     Priority:        0 | ||||||
| IndentCaseLabels: false | IndentCaseLabels: false | ||||||
|   | |||||||
| @@ -10,6 +10,7 @@ | |||||||
|  |  | ||||||
| #ifdef _WIN32 | #ifdef _WIN32 | ||||||
| #include <windows.h> | #include <windows.h> | ||||||
|  | // windows.h needs to be included before other windows headers | ||||||
| #include <commdlg.h> // for GetSaveFileName | #include <commdlg.h> // for GetSaveFileName | ||||||
| #include <direct.h>  // getcwd | #include <direct.h>  // getcwd | ||||||
| #include <io.h> | #include <io.h> | ||||||
|   | |||||||
| @@ -7,6 +7,7 @@ | |||||||
|  |  | ||||||
| #ifdef _WIN32 | #ifdef _WIN32 | ||||||
| #include <windows.h> | #include <windows.h> | ||||||
|  | // Windows.h needs to be included before psapi.h | ||||||
| #include <psapi.h> | #include <psapi.h> | ||||||
| #include "common/common_funcs.h" | #include "common/common_funcs.h" | ||||||
| #include "common/string_util.h" | #include "common/string_util.h" | ||||||
|   | |||||||
| @@ -12,8 +12,8 @@ | |||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
| #include "common/string_util.h" | #include "common/string_util.h" | ||||||
| #ifdef _MSC_VER | #ifdef _MSC_VER | ||||||
| #include <Windows.h> |  | ||||||
| #include <codecvt> | #include <codecvt> | ||||||
|  | #include <Windows.h> | ||||||
| #include "common/common_funcs.h" | #include "common/common_funcs.h" | ||||||
| #else | #else | ||||||
| #include <iconv.h> | #include <iconv.h> | ||||||
|   | |||||||
| @@ -10,9 +10,9 @@ | |||||||
| #include <cstdarg> | #include <cstdarg> | ||||||
| #include <cstdio> | #include <cstdio> | ||||||
| #include <cstring> | #include <cstring> | ||||||
| #include <fcntl.h> |  | ||||||
| #include <map> | #include <map> | ||||||
| #include <numeric> | #include <numeric> | ||||||
|  | #include <fcntl.h> | ||||||
|  |  | ||||||
| #ifdef _MSC_VER | #ifdef _MSC_VER | ||||||
| #include <WinSock2.h> | #include <WinSock2.h> | ||||||
|   | |||||||
| @@ -5,8 +5,8 @@ | |||||||
| #include <algorithm> | #include <algorithm> | ||||||
| #include <cmath> | #include <cmath> | ||||||
| #include <cstdint> | #include <cstdint> | ||||||
| #include <xmmintrin.h> |  | ||||||
| #include <nihstro/shader_bytecode.h> | #include <nihstro/shader_bytecode.h> | ||||||
|  | #include <xmmintrin.h> | ||||||
| #include "common/assert.h" | #include "common/assert.h" | ||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
| #include "common/vector_math.h" | #include "common/vector_math.h" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user