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

Merge remote-tracking branch 'upstream/master' into RDLines

Browse Source
This commit is contained in:
Jaklyy 2024-04-19 06:30:04 -04:00
commit 663e72fe3a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/FixInterfaceIncludes.cmake
View File

@ -19,6 +19,13 @@ function(fix_interface_includes)
if (PARENT_DIR MATCHES "include$") if (PARENT_DIR MATCHES "include$")
list(APPEND NEW_DIRS "${PARENT_DIR}") list(APPEND NEW_DIRS "${PARENT_DIR}")
endif() endif()
# HACK
# The libarchive pkg-config file in MSYS2 seems to include a UNIX-style path for its
# include directory and CMake doesn't like that.
if (WIN32 AND MINGW AND target STREQUAL PkgConfig::LibArchive)
list(FILTER DIRS EXCLUDE REGEX "^/[^.]+64/.*")
endif()
endforeach() endforeach()
list(APPEND DIRS ${NEW_DIRS}) list(APPEND DIRS ${NEW_DIRS})

1
src/debug/GdbStub.h
View File

@ -3,6 +3,7 @@
#define GDBSTUB_H_ #define GDBSTUB_H_
#include <stddef.h> #include <stddef.h>
#include <sys/types.h>
#include <map> #include <map>
#include <vector> #include <vector>