citra-emu
/
citra-canary
Archived
1
0
Fork 0

Remove special rules for Windows.h and library includes

This commit is contained in:
Yuri Kunde Schlesner 2016-09-21 00:13:46 -07:00
parent 84fbbe2629
commit f120e78b56
6 changed files with 8 additions and 10 deletions

View File

@ -46,14 +46,10 @@ DerivePointerAlignment: false
DisableFormat: false
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
IncludeCategories:
- Regex: '^\<[wW]indows.h\>'
Priority: -3
- Regex: '^\<(boost|catch|dynarmic|glad|inih|nihstro)/'
Priority: -1
- Regex: '^\<(SDL|SoundTouch|Q)'
Priority: -1
- Regex: '^\<'
- Regex: '^\<[^Q][^/.>]*\>'
Priority: -2
- Regex: '^\<'
Priority: -1
- Regex: '^\"'
Priority: 0
IndentCaseLabels: false

View File

@ -10,6 +10,7 @@
#ifdef _WIN32
#include <windows.h>
// windows.h needs to be included before other windows headers
#include <commdlg.h> // for GetSaveFileName
#include <direct.h> // getcwd
#include <io.h>

View File

@ -7,6 +7,7 @@
#ifdef _WIN32
#include <windows.h>
// Windows.h needs to be included before psapi.h
#include <psapi.h>
#include "common/common_funcs.h"
#include "common/string_util.h"

View File

@ -12,8 +12,8 @@
#include "common/logging/log.h"
#include "common/string_util.h"
#ifdef _MSC_VER
#include <Windows.h>
#include <codecvt>
#include <Windows.h>
#include "common/common_funcs.h"
#else
#include <iconv.h>

View File

@ -10,9 +10,9 @@
#include <cstdarg>
#include <cstdio>
#include <cstring>
#include <fcntl.h>
#include <map>
#include <numeric>
#include <fcntl.h>
#ifdef _MSC_VER
#include <WinSock2.h>

View File

@ -5,8 +5,8 @@
#include <algorithm>
#include <cmath>
#include <cstdint>
#include <xmmintrin.h>
#include <nihstro/shader_bytecode.h>
#include <xmmintrin.h>
#include "common/assert.h"
#include "common/logging/log.h"
#include "common/vector_math.h"