Firehawk52-backup/dolphin
28
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-01-15 16:33:15 -03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14107 from jordan-woyak/mGBA-version-bump

Browse Source 
Externals: Update mGBA to latest master.
This commit is contained in:
JosJuice
2025-11-23 14:38:39 +01:00
committed by GitHub
parent a2d0ad6a64 6d5e8b9ed8
commit aeac5f1a58
7 changed files with 57 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/mGBA/CMakeLists.txt vendored
View File

@@ -3,7 +3,7 @@ set(USE_LZMA ON)
add_subdirectory(mgba EXCLUDE_FROM_ALL)
dolphin_disable_warnings(mgba)
target_compile_definitions(mgba PUBLIC HAVE_CRC32)
target_compile_definitions(mgba PUBLIC HAVE_CRC32 ENABLE_VFS ENABLE_DIRECTORIES)
target_link_libraries(mgba ZLIB::ZLIB)
if(NOT MSVC)

1
Externals/mGBA/exports.props vendored
View File

@@ -3,6 +3,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(ExternalsDir)mGBA\mgba\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ENABLE_VFS;ENABLE_DIRECTORIES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>

2
Externals/mGBA/mgba vendored

Submodule Externals/mGBA/mgba updated: 8739b22fbc...0b40863f64

15
Externals/mGBA/mgba.vcxproj vendored
View File

@@ -18,7 +18,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>mgba\include;mgba\src;mgba\src\third-party\lzma;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BUILD_STATIC;M_CORE_GB;M_CORE_GBA;USE_LZMA;_7ZIP_PPMD_SUPPPORT;HAVE_STRDUP;HAVE_SETLOCALE;HAVE_CHMOD;HAVE_UMASK;HAVE_CRC32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>BUILD_STATIC;M_CORE_GB;M_CORE_GBA;USE_LZMA;_7ZIP_PPMD_SUPPPORT;HAVE_STRDUP;HAVE_SETLOCALE;HAVE_CHMOD;HAVE_UMASK;HAVE_CRC32;ENABLE_VFS;ENABLE_VFS_FD;ENABLE_DIRECTORIES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<PreBuildEvent>
<Command>"$(CScript)" /nologo /E:JScript "make_version.c.js"</Command>
@@ -67,7 +67,9 @@
</ClCompile>
<ClCompile Include="mgba\src\gb\mbc\pocket-cam.c" />
<ClCompile Include="mgba\src\gb\mbc\tama5.c" />
<ClCompile Include="mgba\src\gb\mbc\unlicensed.c" />
<ClCompile Include="mgba\src\gb\mbc\unlicensed.c" >
<ObjectFileName>$(IntDir)obj2\</ObjectFileName>
</ClCompile>
<ClCompile Include="mgba\src\gb\memory.c" />
<ClCompile Include="mgba\src\gb\overrides.c" />
<ClCompile Include="mgba\src\gb\serialize.c">
@@ -95,6 +97,7 @@
<ClCompile Include="mgba\src\gba\cart\ereader.c" />
<ClCompile Include="mgba\src\gba\cart\gpio.c" />
<ClCompile Include="mgba\src\gba\cart\matrix.c" />
<ClCompile Include="mgba\src\gba\cart\unlicensed.c" />
<ClCompile Include="mgba\src\gba\cart\vfame.c" />
<ClCompile Include="mgba\src\gba\cheats.c">
<ObjectFileName>$(IntDir)obj3\</ObjectFileName>
@@ -138,13 +141,14 @@
<ObjectFileName>$(IntDir)obj2\</ObjectFileName>
</ClCompile>
<ClCompile Include="mgba\src\gba\sio\gbp.c" />
<ClCompile Include="mgba\src\gba\sio\joybus.c" />
<ClCompile Include="mgba\src\gba\timer.c">
<ObjectFileName>$(IntDir)obj2\</ObjectFileName>
</ClCompile>
<ClCompile Include="mgba\src\gba\video.c">
<ObjectFileName>$(IntDir)obj2\</ObjectFileName>
</ClCompile>
<ClCompile Include="mgba\src\util\audio-buffer.c" />
<ClCompile Include="mgba\src\util\audio-resampler.c" />
<ClCompile Include="mgba\src\util\circle-buffer.c" />
<ClCompile Include="mgba\src\util\configuration.c" />
<ClCompile Include="mgba\src\util\crc32.c" />
@@ -153,6 +157,9 @@
<ClCompile Include="mgba\src\util\geometry.c" />
<ClCompile Include="mgba\src\util\hash.c" />
<ClCompile Include="mgba\src\util\image.c" />
<ClCompile Include="mgba\src\util\interpolator.c" />
<ClCompile Include="mgba\src\util\md5.c" />
<ClCompile Include="mgba\src\util\sha1.c" />
<ClCompile Include="mgba\src\util\string.c" />
<ClCompile Include="mgba\src\util\table.c" />
<ClCompile Include="mgba\src\util\vector.c" />
@@ -177,7 +184,6 @@
<ObjectFileName>$(IntDir)obj3\</ObjectFileName>
</ClCompile>
<ClCompile Include="mgba\src\third-party\inih\ini.c" />
<ClCompile Include="mgba\src\third-party\blip_buf\blip_buf.c" />
<ClCompile Include="mgba\src\util\vfs\vfs-lzma.c" />
<ClCompile Include="mgba\src\third-party\lzma\7zAlloc.c" />
<ClCompile Include="mgba\src\third-party\lzma\7zArcIn.c" />
@@ -206,7 +212,6 @@
<ObjectFileName>$(IntDir)obj3\</ObjectFileName>
</ClCompile>
<ClCompile Include="mgba\src\gb\sio\printer.c" />
<ClCompile Include="mgba\src\gba\extra\audio-mixer.c" />
<ClCompile Include="mgba\src\gba\extra\battlechip.c" />
<ClCompile Include="mgba\src\gba\extra\proxy.c" />
<ClCompile Include="mgba\src\gb\extra\proxy.c">