mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-30 21:30:04 +00:00 
			
		
		
		
	Merge pull request #2172 from jroweboy/fix-mingw
Fix mingw compilation support
This commit is contained in:
		
						commit
						fb13bfe693
					
				
					 5 changed files with 20 additions and 6 deletions
				
			
		|  | @ -11,7 +11,8 @@ | |||
| #include "common/common_paths.h" | ||||
| #include "common/logging/log.h" | ||||
| #include "common/string_util.h" | ||||
| #ifdef _MSC_VER | ||||
| 
 | ||||
| #ifdef _WIN32 | ||||
| #include <codecvt> | ||||
| #include <Windows.h> | ||||
| #include "common/common_funcs.h" | ||||
|  | @ -270,7 +271,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st | |||
|     return result; | ||||
| } | ||||
| 
 | ||||
| #ifdef _MSC_VER | ||||
| #ifdef _WIN32 | ||||
| 
 | ||||
| std::string UTF16ToUTF8(const std::u16string& input) { | ||||
| #if _MSC_VER >= 1900 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue