artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2267 from JayFoxRox/fix-mingw-cc

Browse source 
Support mingw cross-compilation
This commit is contained in:
Sebastian Valle 2016-12-11 14:44:21 -05:00 committed by GitHub
parent 77fd4f4237 0aee903ada
commit 2589c30cbe
9 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/citra/citra.cpp
View file

@ -18,7 +18,7 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <windows.h>
#endif #endif
#include "citra/config.h" #include "citra/config.h"

2
src/citra/citra.rc
View file

@ -5,5 +5,5 @@
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
GLFW_ICON ICON "..\\..\\dist\\citra.ico" CITRA_ICON ICON "../../dist/citra.ico"

2
src/citra_qt/citra-qt.rc
View file

@ -5,5 +5,5 @@
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
IDI_ICON1 ICON "..\\..\\dist\\citra.ico" CITRA_ICON ICON "../../dist/citra.ico"

2
src/common/bit_set.h
View file

@ -16,7 +16,7 @@ namespace Common {
// Helper functions: // Helper functions:
#ifdef _WIN32 #ifdef _MSC_VER
template <typename T> template <typename T>
static inline int CountSetBits(T v) { static inline int CountSetBits(T v) {
// from https://graphics.stanford.edu/~seander/bithacks.html // from https://graphics.stanford.edu/~seander/bithacks.html

2
src/common/logging/text_formatter.cpp
View file

@ -7,7 +7,7 @@
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> #include <windows.h>
#endif #endif
#include "common/assert.h" #include "common/assert.h"

2
src/common/string_util.cpp
View file

@ -14,7 +14,7 @@
#ifdef _WIN32 #ifdef _WIN32
#include <codecvt> #include <codecvt>
#include <Windows.h> #include <windows.h>
#include "common/common_funcs.h" #include "common/common_funcs.h"
#else #else
#include <iconv.h> #include <iconv.h>

2
src/common/thread.cpp
View file

@ -6,7 +6,7 @@
#ifdef __APPLE__ #ifdef __APPLE__
#include <mach/mach.h> #include <mach/mach.h>
#elif defined(_WIN32) #elif defined(_WIN32)
#include <Windows.h> #include <windows.h>
#else #else
#if defined(__Bitrig__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__) #if defined(__Bitrig__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
#include <pthread_np.h> #include <pthread_np.h>

3
src/common/timer.cpp
View file

@ -4,7 +4,8 @@
#include <time.h> #include <time.h>
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <windows.h>
// windows.h needs to be included before other windows headers
#include <mmsystem.h> #include <mmsystem.h>
#include <sys/timeb.h> #include <sys/timeb.h>
#else #else

4
src/core/gdbstub/gdbstub.cpp
View file

@ -15,8 +15,8 @@
#include <fcntl.h> #include <fcntl.h>
#ifdef _WIN32 #ifdef _WIN32
#include <WinSock2.h> #include <winsock2.h>
#include <common/x64/abi.h> // winsock2.h needs to be included first to prevent winsock.h being included by other includes
#include <io.h> #include <io.h>
#include <iphlpapi.h> #include <iphlpapi.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>