summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-01-12 06:44:45 +0100
committerbunnei <bunneidev@gmail.com>2015-01-12 06:44:45 +0100
commit2f7069f9bda8ce466e99b1202eaa1cc06125fd6f (patch)
tree968b7da92722d34ab37153f39aedfed693fed376 /src
parentMerge pull request #468 from lioncash/adc (diff)
parentFix building on MinGW (diff)
downloadyuzu-2f7069f9bda8ce466e99b1202eaa1cc06125fd6f.tar
yuzu-2f7069f9bda8ce466e99b1202eaa1cc06125fd6f.tar.gz
yuzu-2f7069f9bda8ce466e99b1202eaa1cc06125fd6f.tar.bz2
yuzu-2f7069f9bda8ce466e99b1202eaa1cc06125fd6f.tar.lz
yuzu-2f7069f9bda8ce466e99b1202eaa1cc06125fd6f.tar.xz
yuzu-2f7069f9bda8ce466e99b1202eaa1cc06125fd6f.tar.zst
yuzu-2f7069f9bda8ce466e99b1202eaa1cc06125fd6f.zip
Diffstat (limited to '')
-rw-r--r--src/citra/citra.rcbin566 -> 282 bytes
-rw-r--r--src/core/hle/service/soc_u.cpp13
2 files changed, 13 insertions, 0 deletions
diff --git a/src/citra/citra.rc b/src/citra/citra.rc
index c28e7dbe5..0165e93da 100644
--- a/src/citra/citra.rc
+++ b/src/citra/citra.rc
Binary files differ
diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp
index f502c6afe..bb8ee86be 100644
--- a/src/core/hle/service/soc_u.cpp
+++ b/src/core/hle/service/soc_u.cpp
@@ -7,6 +7,19 @@
#if EMU_PLATFORM == PLATFORM_WINDOWS
#include <winsock2.h>
#include <ws2tcpip.h>
+
+// MinGW does not define several errno constants
+#ifndef _MSC_VER
+#define EBADMSG 104
+#define ENODATA 120
+#define ENOMSG 122
+#define ENOSR 124
+#define ENOSTR 125
+#define ETIME 137
+#define EIDRM 2001
+#define ENOLINK 2002
+#endif // _MSC_VER
+
#else
#include <sys/socket.h>
#include <netinet/in.h>