mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-11-20 00:13:33 +00:00
Merge 59d2a0e4a2 into 0fdf1cc386
This commit is contained in:
shuffle2
GitHub
commit
a4617e66f2
2
Externals/FatFs/FatFs.vcxproj
vendored
2
Externals/FatFs/FatFs.vcxproj
vendored
@ -30,4 +30,4 @@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
2
Externals/SDL/SDL3.vcxproj
vendored
2
Externals/SDL/SDL3.vcxproj
vendored
@ -512,4 +512,4 @@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
126
Externals/SFML/SFML.vcxproj
vendored
126
Externals/SFML/SFML.vcxproj
vendored
@ -1,67 +1,65 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project>
|
||||
<Import Project="..\..\Source\VSProps\Base.Macros.props" />
|
||||
<Import Project="$(VSPropsDir)Base.Targets.props" />
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{93D73454-2512-424E-9CDA-4BB357FE13DD}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings" />
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
|
||||
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
|
||||
Label="LocalAppDataPlatform" />
|
||||
<Import Project="$(VSPropsDir)Base.props" />
|
||||
<Import Project="$(VSPropsDir)ClDisableAllWarnings.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>SFML\include;SFML\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>SFML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="SFML\src\SFML\Network\Http.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\IpAddress.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\Packet.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\Socket.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\SocketSelector.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\TcpListener.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\TcpSocket.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\UdpSocket.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\Win32\SocketImpl.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\System\Err.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\System\String.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\System\Utils.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="SFML\include\SFML\Config.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\Export.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\Http.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\IPAddress.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\Packet.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\Socket.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\SocketHandle.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\SocketSelector.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\TcpListener.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\TcpSocket.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\UdpSocket.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System\Err.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System\Export.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System\NonCopyable.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System\String.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System\String.inl" />
|
||||
<ClInclude Include="SFML\include\SFML\System\Utf.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System\Utf.inl" />
|
||||
<ClInclude Include="SFML\src\SFML\Network\SocketImpl.hpp" />
|
||||
<ClInclude Include="SFML\src\SFML\Network\Win32\SocketImpl.hpp" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
<Import Project="..\..\Source\VSProps\Base.Macros.props" />
|
||||
<Import Project="$(VSPropsDir)Base.Targets.props" />
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{93D73454-2512-424E-9CDA-4BB357FE13DD}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings" />
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="$(VSPropsDir)Base.props" />
|
||||
<Import Project="$(VSPropsDir)ClDisableAllWarnings.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>SFML\include;SFML\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>SFML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="SFML\src\SFML\Network\Http.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\IpAddress.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\Packet.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\Socket.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\SocketSelector.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\TcpListener.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\TcpSocket.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\UdpSocket.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\Network\Win32\SocketImpl.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\System\Err.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\System\String.cpp" />
|
||||
<ClCompile Include="SFML\src\SFML\System\Utils.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="SFML\include\SFML\Config.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\Export.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\Http.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\IPAddress.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\Packet.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\Socket.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\SocketHandle.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\SocketSelector.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\TcpListener.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\TcpSocket.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\Network\UdpSocket.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System\Err.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System\Export.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System\NonCopyable.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System\String.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System\String.inl" />
|
||||
<ClInclude Include="SFML\include\SFML\System\Utf.hpp" />
|
||||
<ClInclude Include="SFML\include\SFML\System\Utf.inl" />
|
||||
<ClInclude Include="SFML\src\SFML\Network\SocketImpl.hpp" />
|
||||
<ClInclude Include="SFML\src\SFML\Network\Win32\SocketImpl.hpp" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
2
Externals/cpp-ipc/cpp-ipc.vcxproj
vendored
2
Externals/cpp-ipc/cpp-ipc.vcxproj
vendored
@ -75,4 +75,4 @@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
42
Externals/cubeb/msvc/cubeb.vcxproj.filters
vendored
42
Externals/cubeb/msvc/cubeb.vcxproj.filters
vendored
@ -6,7 +6,6 @@
|
||||
<ClInclude Include="..\cubeb\src\cubeb_assert.h" />
|
||||
<ClInclude Include="..\cubeb\src\cubeb_log.h" />
|
||||
<ClInclude Include="..\cubeb\src\cubeb_mixer.h" />
|
||||
<ClInclude Include="..\cubeb\src\cubeb_panner.h" />
|
||||
<ClInclude Include="..\cubeb\src\cubeb_resampler.h" />
|
||||
<ClInclude Include="..\cubeb\src\cubeb_resampler_internal.h" />
|
||||
<ClInclude Include="..\cubeb\src\cubeb_ring_array.h" />
|
||||
@ -18,45 +17,34 @@
|
||||
<ClInclude Include="..\cubeb\src\cubeb_utils_win.h" />
|
||||
<ClInclude Include="..\cubeb\src\cubeb-internal.h" />
|
||||
<ClInclude Include="..\cubeb\src\cubeb-speex-resampler.h" />
|
||||
<ClInclude Include="..\cubeb\src\speex\arch.h">
|
||||
<Filter>speex</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\cubeb\src\speex\fixed_generic.h">
|
||||
<Filter>speex</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\cubeb\src\speex\resample_neon.h">
|
||||
<Filter>speex</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\cubeb\src\speex\resample_sse.h">
|
||||
<Filter>speex</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\cubeb\src\speex\speex_config_types.h">
|
||||
<Filter>speex</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\cubeb\src\speex\speex_resampler.h">
|
||||
<Filter>speex</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\cubeb\src\speex\stack_alloc.h">
|
||||
<Filter>speex</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\msvc\cubeb_export.h" />
|
||||
<ClInclude Include="..\cubeb\src\cubeb_android.h" />
|
||||
<ClInclude Include="..\cubeb\src\cubeb_osx_run_loop.h" />
|
||||
<ClInclude Include="..\cubeb\src\cubeb_tracing.h" />
|
||||
<ClInclude Include="..\cubeb\src\cubeb-jni.h" />
|
||||
<ClInclude Include="..\cubeb\src\cubeb-jni-instances.h" />
|
||||
<ClInclude Include="..\cubeb\subprojects\speex\arch.h" />
|
||||
<ClInclude Include="..\cubeb\subprojects\speex\fixed_generic.h" />
|
||||
<ClInclude Include="..\cubeb\subprojects\speex\resample_neon.h" />
|
||||
<ClInclude Include="..\cubeb\subprojects\speex\resample_sse.h" />
|
||||
<ClInclude Include="..\cubeb\subprojects\speex\speex_config_types.h" />
|
||||
<ClInclude Include="..\cubeb\subprojects\speex\speex_resampler.h" />
|
||||
<ClInclude Include="..\cubeb\subprojects\speex\stack_alloc.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\cubeb\src\cubeb.c" />
|
||||
<ClCompile Include="..\cubeb\src\cubeb_log.cpp" />
|
||||
<ClCompile Include="..\cubeb\src\cubeb_mixer.cpp" />
|
||||
<ClCompile Include="..\cubeb\src\cubeb_panner.cpp" />
|
||||
<ClCompile Include="..\cubeb\src\cubeb_resampler.cpp" />
|
||||
<ClCompile Include="..\cubeb\src\cubeb_strings.c" />
|
||||
<ClCompile Include="..\cubeb\src\cubeb_wasapi.cpp" />
|
||||
<ClCompile Include="..\cubeb\src\cubeb_winmm.c" />
|
||||
<ClCompile Include="..\cubeb\src\speex\resample.c">
|
||||
<Filter>speex</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\cubeb\src\cubeb_utils.cpp" />
|
||||
<ClCompile Include="..\cubeb\subprojects\speex\resample.c" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Filter Include="speex">
|
||||
<UniqueIdentifier>{caf7c7d0-0918-4299-8423-b287285d6fd0}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
2
Externals/curl/curl.vcxproj
vendored
2
Externals/curl/curl.vcxproj
vendored
@ -387,4 +387,4 @@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
@ -41,4 +41,4 @@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
4
Externals/glslang/glslang.vcxproj
vendored
4
Externals/glslang/glslang.vcxproj
vendored
@ -30,7 +30,7 @@
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<CmakeGenerator>"Visual Studio $(VisualStudioVersion.Substring(0,2))"</CmakeGenerator>
|
||||
<DevCmdArch Condition="'$(Platform)'=='x64'">amd64</DevCmdArch>
|
||||
<DevCmdArch Condition="'$(Platform)'=='ARM64'">arm64</DevCmdArch>
|
||||
<DevCmdArch Condition="'$(Platform)'=='ARM64'">arm64</DevCmdArch>
|
||||
<CmakeReleaseCLI>call vsdevcmd.bat -arch=$(DevCmdArch)
|
||||
cmake -G $(CmakeGenerator) -A $(Platform) -DCMAKE_BUILD_TYPE="Release" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DGLSLANG_TESTS=OFF -DENABLE_GLSLANG_BINARIES=OFF -DBUILD_EXTERNAL=OFF -DENABLE_SPVREMAPPER=OFF -DENABLE_HLSL=OFF -DENABLE_OPT=OFF -DENABLE_EXCEPTIONS=OFF -S glslang -B "$(BuildRootDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)"
|
||||
</CmakeReleaseCLI>
|
||||
@ -94,4 +94,4 @@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
70
Externals/implot/implot.vcxproj
vendored
70
Externals/implot/implot.vcxproj
vendored
@ -1,37 +1,37 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project>
|
||||
<Import Project="..\..\Source\VSProps\Base.Macros.props" />
|
||||
<Import Project="$(VSPropsDir)Base.Targets.props" />
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{A608225E-AE0A-4D1A-9B55-97F57C862391}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings" />
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="$(VSPropsDir)Base.props" />
|
||||
<Import Project="$(VSPropsDir)ClDisableAllWarnings.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<!--IM_ASSERT is defined as Dolphin's ASSERT() :( (DolphinLib circular dependency)-->
|
||||
<AdditionalIncludeDirectories>$(CoreDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="implot/implot.cpp" />
|
||||
<ClCompile Include="implot/implot_items.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="implot/implot.h" />
|
||||
<ClInclude Include="implot/implot_internal.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(ExternalsDir)imgui\exports.props" />
|
||||
<Import Project="$(ExternalsDir)fmt\exports.props" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
<Import Project="..\..\Source\VSProps\Base.Macros.props" />
|
||||
<Import Project="$(VSPropsDir)Base.Targets.props" />
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{A608225E-AE0A-4D1A-9B55-97F57C862391}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings" />
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="$(VSPropsDir)Base.props" />
|
||||
<Import Project="$(VSPropsDir)ClDisableAllWarnings.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<!--IM_ASSERT is defined as Dolphin's ASSERT() :( (DolphinLib circular dependency)-->
|
||||
<AdditionalIncludeDirectories>$(CoreDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="implot/implot.cpp" />
|
||||
<ClCompile Include="implot/implot_items.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="implot/implot.h" />
|
||||
<ClInclude Include="implot/implot_internal.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(ExternalsDir)imgui\exports.props" />
|
||||
<Import Project="$(ExternalsDir)fmt\exports.props" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
19
Externals/mGBA/mgba.vcxproj.filters
vendored
19
Externals/mGBA/mgba.vcxproj.filters
vendored
@ -283,7 +283,16 @@
|
||||
<ClCompile Include="mgba\src\util\elf-read.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="mgba\src\util\export.c">
|
||||
<ClCompile Include="mgba\src\util\geometry.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="mgba\src\util\image.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="mgba\src\util\image\export.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="mgba\src\util\image\png-io.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="mgba\src\util\patch.c">
|
||||
@ -298,9 +307,6 @@
|
||||
<ClCompile Include="mgba\src\util\patch-ups.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="mgba\src\util\png-io.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="mgba\src\util\ring-fifo.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
@ -427,6 +433,9 @@
|
||||
<ClCompile Include="mgba\src\feature\updater.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="mgba\src\feature\video-backend.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="mgba\src\feature\video-logger.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
@ -448,4 +457,4 @@
|
||||
<UniqueIdentifier>{37E5D4D5-B263-3B94-8968-21228F26DF67}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
2
Externals/tinygltf/tinygltf.vcxproj
vendored
2
Externals/tinygltf/tinygltf.vcxproj
vendored
@ -32,4 +32,4 @@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
@ -25,7 +25,7 @@
|
||||
<MoFilesDst Include="@(MoFiles -> '$(BinaryOutputDir)Languages\%(Filename)%(Extension)')" />
|
||||
</ItemGroup>
|
||||
<Target Name="MsgFmtCompile" BeforeTargets="BuildGenerateSources" Inputs="@(PoFiles)" Outputs="@(MoFiles)">
|
||||
<Exec Command='$(msgfmt) -o "$(OutDir)%(PoFiles.Filename).mo" "@(PoFiles)"' />
|
||||
<Exec Command="$(msgfmt) -o "$(OutDir)%(PoFiles.Filename).mo" "@(PoFiles)"" />
|
||||
</Target>
|
||||
<Target Name="MsgFmtCopy" AfterTargets="MsgFmtCompile" Inputs="@(MoFiles)" Outputs="@(MoFilesDst)">
|
||||
<Copy SourceFiles="@(MoFiles)" DestinationFiles="@(MoFilesDst)" SkipUnchangedFiles="true" />
|
||||
|
||||
@ -71,20 +71,16 @@
|
||||
<ItemGroup>
|
||||
<Text Include="$(BuildInfoTemplate)" />
|
||||
</ItemGroup>
|
||||
<UsingTask TaskName="GetProductVersion"
|
||||
TaskFactory="CodeTaskFactory"
|
||||
AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
|
||||
<UsingTask TaskName="GetProductVersion" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
|
||||
<ParameterGroup>
|
||||
<Path ParameterType="System.String" Required="true" />
|
||||
<ProductVersion ParameterType="System.String" Output="true" />
|
||||
</ParameterGroup>
|
||||
<Task>
|
||||
<Using Namespace="System.Diagnostics"/>
|
||||
<Code Type="Fragment" Language="cs">
|
||||
<![CDATA[
|
||||
<Using Namespace="System.Diagnostics" />
|
||||
<Code Type="Fragment" Language="cs"><![CDATA[
|
||||
ProductVersion = FileVersionInfo.GetVersionInfo(Path).ProductVersion;
|
||||
]]>
|
||||
</Code>
|
||||
]]></Code>
|
||||
</Task>
|
||||
</UsingTask>
|
||||
<Target Name="WriteBuildInfo" AfterTargets="Build" Inputs="$(BuildInfoTemplate)" Outputs="$(BuildInfoOutput)">
|
||||
@ -92,10 +88,6 @@
|
||||
<Output PropertyName="VCToolsProductVersion" TaskParameter="ProductVersion" />
|
||||
</GetProductVersion>
|
||||
<Message Text="VCToolsProductVersion $(VCToolsProductVersion)" Importance="High" />
|
||||
<WriteLinesToFile
|
||||
File="$(BuildInfoOutput)"
|
||||
Lines="$([System.IO.File]::ReadAllText($(BuildInfoTemplate)).Replace('${VC_TOOLS_VERSION}', $(VCToolsProductVersion)))"
|
||||
Overwrite="true"
|
||||
/>
|
||||
<WriteLinesToFile File="$(BuildInfoOutput)" Lines="$([System.IO.File]::ReadAllText($(BuildInfoTemplate)).Replace('${VC_TOOLS_VERSION}', $(VCToolsProductVersion)))" Overwrite="true" />
|
||||
</Target>
|
||||
</Project>
|
||||
@ -64,4 +64,4 @@
|
||||
<Message Text="Copy: @(SourceFiles) -> $(BinaryOutputDir)" Importance="High" />
|
||||
<Copy SourceFiles="@(SourceFiles)" DestinationFolder="$(BinaryOutputDir)" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
@ -70,4 +70,4 @@
|
||||
<Message Text="Copy: @(SourceFiles) -> $(BinaryOutputDir)" Importance="High" />
|
||||
<Copy SourceFiles="@(SourceFiles)" DestinationFolder="$(BinaryOutputDir)" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
@ -1,10 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\UpdaterCommon\UpdaterCommon.cpp" />
|
||||
<ClCompile Include="Main.cpp" />
|
||||
<ClCompile Include="Platform.cpp" />
|
||||
<ClCompile Include="WinUI.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Manifest Include="Updater.exe.manifest" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\UpdaterCommon\Platform.h" />
|
||||
<ClInclude Include="..\UpdaterCommon\UI.h" />
|
||||
<ClInclude Include="..\UpdaterCommon\UpdaterCommon.h" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@ -5,20 +5,6 @@
|
||||
<UniqueIdentifier>{0b70242b-1d98-432f-a60e-d4ca0674852e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Testdata\dsp_test.bin">
|
||||
<Filter>TestData</Filter>
|
||||
</None>
|
||||
<None Include="Testdata\dsp_test.S">
|
||||
<Filter>TestData</Filter>
|
||||
</None>
|
||||
<None Include="Testdata\hermes.bin">
|
||||
<Filter>TestData</Filter>
|
||||
</None>
|
||||
<None Include="Testdata\hermes.s">
|
||||
<Filter>TestData</Filter>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="DSPTool.cpp" />
|
||||
<ClCompile Include="StubHost.cpp" />
|
||||
|
||||
@ -6,15 +6,15 @@
|
||||
#define STRINGIFY_HELPER(x) #x
|
||||
#define STRINGIFY(x) STRINGIFY_HELPER(x)
|
||||
|
||||
#if defined _MSC_FULL_VER && _MSC_FULL_VER < 193632532
|
||||
#if defined _MSC_FULL_VER && _MSC_FULL_VER < 195035717
|
||||
#pragma message("Current _MSC_FULL_VER: " STRINGIFY(_MSC_FULL_VER))
|
||||
#error Please update your build environment to the latest Visual Studio 2022!
|
||||
#error Please update your build environment to the latest Visual Studio!
|
||||
#endif
|
||||
|
||||
#include <sdkddkver.h>
|
||||
#ifndef NTDDI_WIN10_NI
|
||||
#ifndef NTDDI_WIN11_GE
|
||||
#pragma message("Current WDK_NTDDI_VERSION: " STRINGIFY(WDK_NTDDI_VERSION))
|
||||
#error Windows 10.0.22621 SDK or later is required
|
||||
#error Windows 10.0.26100.6901 SDK or later is required
|
||||
#endif
|
||||
|
||||
#undef STRINGIFY
|
||||
|
||||
@ -122,4 +122,4 @@
|
||||
<!--This is only executed via msbuild, VS test runner automatically does this-->
|
||||
<Exec Command="$(TargetPath)" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project>
|
||||
<PropertyGroup Label="Configuration">
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<PlatformToolset>v145</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PreferredToolArchitecture Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='x64'">x64</PreferredToolArchitecture>
|
||||
<PreferredToolArchitecture Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='ARM64'">ARM64</PreferredToolArchitecture>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user