From d21bc64cb31641e52a71589624b247a6aa894e72 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Wed, 15 May 2024 18:57:49 +0200
Subject: [PATCH] MinGW build portability fixes

AKA you can build melonDS for Windows on Fedora now
---
 src/debug/GdbProto.cpp               | 2 +-
 src/debug/GdbStub.cpp                | 2 +-
 src/frontend/libslirp/CMakeLists.txt | 7 ++++++-
 src/frontend/qt_sdl/CMakeLists.txt   | 4 ++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/debug/GdbProto.cpp b/src/debug/GdbProto.cpp
index ebdf3be5..bd7e6e65 100644
--- a/src/debug/GdbProto.cpp
+++ b/src/debug/GdbProto.cpp
@@ -1,6 +1,6 @@
 
 #ifdef _WIN32
-#include <WS2tcpip.h>
+#include <ws2tcpip.h>
 #include <winsock.h>
 #include <winsock2.h>
 #endif
diff --git a/src/debug/GdbStub.cpp b/src/debug/GdbStub.cpp
index 099f27f1..53101cec 100644
--- a/src/debug/GdbStub.cpp
+++ b/src/debug/GdbStub.cpp
@@ -1,6 +1,6 @@
 
 #ifdef _WIN32
-#include <WS2tcpip.h>
+#include <ws2tcpip.h>
 #include <winsock.h>
 #include <winsock2.h>
 #endif
diff --git a/src/frontend/libslirp/CMakeLists.txt b/src/frontend/libslirp/CMakeLists.txt
index cd4dea5a..73ba59d6 100644
--- a/src/frontend/libslirp/CMakeLists.txt
+++ b/src/frontend/libslirp/CMakeLists.txt
@@ -46,7 +46,12 @@ set(SOURCES
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/libslirp-version.h.in" "${CMAKE_CURRENT_BINARY_DIR}/libslirp-version.h")
 
-add_library(slirp STATIC ${SOURCES})
+if (BUILD_STATIC)
+	add_library(slirp STATIC ${SOURCES})
+else()
+	add_library(slirp ${SOURCES})
+endif()
+
 target_include_directories(slirp PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/glib")
 target_include_directories(slirp PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src")
 target_include_directories(slirp PUBLIC "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt
index f48a490e..60962328 100644
--- a/src/frontend/qt_sdl/CMakeLists.txt
+++ b/src/frontend/qt_sdl/CMakeLists.txt
@@ -112,6 +112,10 @@ if (WIN32)
 
         ../glad/glad_wgl.c
     )
+
+    if (MINGW AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+        set_property(TARGET melonDS PROPERTY AUTORCC_OPTIONS "--no-zstd")
+    endif()
 elseif (APPLE)
     if (NOT USE_QT6)
         find_library(COCOA_LIB Cocoa)