summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Valle <subv2112@gmail.com>2016-12-11 20:44:21 +0100
committerGitHub <noreply@github.com>2016-12-11 20:44:21 +0100
commit2589c30cbee4e90b717cb8f42e1f25e2eabc119f (patch)
tree92f4d13a3c2cca41664f8d4a31c09ad9dd3e80ae
parentMerge pull request #2154 from mailwl/apt-getstartupargument (diff)
parentgdbstub: Remove unused include (diff)
downloadyuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar
yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar.gz
yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar.bz2
yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar.lz
yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar.xz
yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar.zst
yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.zip
-rw-r--r--src/citra/citra.cpp2
-rw-r--r--src/citra/citra.rc2
-rw-r--r--src/citra_qt/citra-qt.rc2
-rw-r--r--src/common/bit_set.h2
-rw-r--r--src/common/logging/text_formatter.cpp2
-rw-r--r--src/common/string_util.cpp2
-rw-r--r--src/common/thread.cpp2
-rw-r--r--src/common/timer.cpp3
-rw-r--r--src/core/gdbstub/gdbstub.cpp4
9 files changed, 11 insertions, 10 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index f9387e61c..3114a71db 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -18,7 +18,7 @@
#endif
#ifdef _WIN32
-#include <Windows.h>
+#include <windows.h>
#endif
#include "citra/config.h"
diff --git a/src/citra/citra.rc b/src/citra/citra.rc
index b0edb2e6b..fea603004 100644
--- a/src/citra/citra.rc
+++ b/src/citra/citra.rc
@@ -5,5 +5,5 @@
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-GLFW_ICON ICON "..\\..\\dist\\citra.ico"
+CITRA_ICON ICON "../../dist/citra.ico"
diff --git a/src/citra_qt/citra-qt.rc b/src/citra_qt/citra-qt.rc
index 3c7239853..fea603004 100644
--- a/src/citra_qt/citra-qt.rc
+++ b/src/citra_qt/citra-qt.rc
@@ -5,5 +5,5 @@
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_ICON1 ICON "..\\..\\dist\\citra.ico"
+CITRA_ICON ICON "../../dist/citra.ico"
diff --git a/src/common/bit_set.h b/src/common/bit_set.h
index c48b3b769..3059d0cb0 100644
--- a/src/common/bit_set.h
+++ b/src/common/bit_set.h
@@ -16,7 +16,7 @@ namespace Common {
// Helper functions:
-#ifdef _WIN32
+#ifdef _MSC_VER
template <typename T>
static inline int CountSetBits(T v) {
// from https://graphics.stanford.edu/~seander/bithacks.html
diff --git a/src/common/logging/text_formatter.cpp b/src/common/logging/text_formatter.cpp
index d61c1696b..9d423766f 100644
--- a/src/common/logging/text_formatter.cpp
+++ b/src/common/logging/text_formatter.cpp
@@ -7,7 +7,7 @@
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
#endif
#include "common/assert.h"
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index df1008180..bad311793 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -14,7 +14,7 @@
#ifdef _WIN32
#include <codecvt>
-#include <Windows.h>
+#include <windows.h>
#include "common/common_funcs.h"
#else
#include <iconv.h>
diff --git a/src/common/thread.cpp b/src/common/thread.cpp
index 9bb2f4e1d..9e207118f 100644
--- a/src/common/thread.cpp
+++ b/src/common/thread.cpp
@@ -6,7 +6,7 @@
#ifdef __APPLE__
#include <mach/mach.h>
#elif defined(_WIN32)
-#include <Windows.h>
+#include <windows.h>
#else
#if defined(__Bitrig__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
#include <pthread_np.h>
diff --git a/src/common/timer.cpp b/src/common/timer.cpp
index e843cbd9c..c9803109e 100644
--- a/src/common/timer.cpp
+++ b/src/common/timer.cpp
@@ -4,7 +4,8 @@
#include <time.h>
#ifdef _WIN32
-#include <Windows.h>
+#include <windows.h>
+// windows.h needs to be included before other windows headers
#include <mmsystem.h>
#include <sys/timeb.h>
#else
diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp
index aea43e92b..21d941363 100644
--- a/src/core/gdbstub/gdbstub.cpp
+++ b/src/core/gdbstub/gdbstub.cpp
@@ -15,8 +15,8 @@
#include <fcntl.h>
#ifdef _WIN32
-#include <WinSock2.h>
-#include <common/x64/abi.h>
+#include <winsock2.h>
+// winsock2.h needs to be included first to prevent winsock.h being included by other includes
#include <io.h>
#include <iphlpapi.h>
#include <ws2tcpip.h>