piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2024-11-14 13:27:41 -07:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

MinGW build portability fixes

Browse Source 
AKA you can build melonDS for Windows on Fedora now
This commit is contained in:
Nadia Holmquist Pedersen 2024-05-15 18:57:49 +02:00
parent a2406e3c0e
commit d21bc64cb3
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/debug/GdbProto.cpp
View File

@ -1,6 +1,6 @@
#ifdef _WIN32
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#include <winsock.h>
#include <winsock2.h>
#endif

2
src/debug/GdbStub.cpp
View File

@ -1,6 +1,6 @@
#ifdef _WIN32
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#include <winsock.h>
#include <winsock2.h>
#endif

7
src/frontend/libslirp/CMakeLists.txt
View File

@ -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}")

4
src/frontend/qt_sdl/CMakeLists.txt
View File

@ -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)