Skip to content

Commit 31dcc07

Browse files
committed
uwp: update project files for smb client
1 parent d6130a7 commit 31dcc07

File tree

3 files changed

+40
-5
lines changed

3 files changed

+40
-5
lines changed

pkg/msvc-uwp/RetroArch-msvcUWP/Package.appxmanifest

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp rescap">
33
<Identity Name="1e4cf179-f3c2-404f-b9f3-cb2070a5aad8" Publisher="CN=libretro" Version="1.22.2.0" />
44
<mp:PhoneIdentity PhoneProductId="1e4cf179-f3c2-404f-b9f3-cb2070a5aad8" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
@@ -32,6 +32,7 @@
3232
<Capabilities>
3333
<Capability Name="internetClient" />
3434
<Capability Name="internetClientServer" />
35+
<Capability Name="privateNetworkClientServer"/>
3536
<rescap:Capability Name="runFullTrust"/>
3637
<rescap:Capability Name="broadFileSystemAccess" />
3738
<rescap:Capability Name="expandedResources" />

pkg/msvc-uwp/RetroArch-msvcUWP/RetroArch-msvcUWP.vcxproj

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@
8080
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
8181
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
8282
<PackageCertificateKeyFile>RetroArch-msvcUWP_TemporaryKey.pfx</PackageCertificateKeyFile>
83+
<IncludePath>$(ProjectDir)..\..\..\deps\libsmb2\include;$(IncludePath)</IncludePath>
84+
<LibraryPath>$(ProjectDir)..\..\..\deps\libsmb2\build\lib\$(Configuration);$(LibraryPath)</LibraryPath>
8385
</PropertyGroup>
8486
<ItemDefinitionGroup>
8587
<ClCompile>
@@ -134,6 +136,14 @@
134136
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
135137
<PreprocessorDefinitions>WIN32;HAVE_XDELTA;HAVE_MAIN;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_BUILTINGLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_ONLINE_UPDATER;HAVE_UPDATE_ASSETS;HAVE_UPDATE_CORES;HAVE_UPDATE_CORE_INFO;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_CHD;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_7ZIP;_7ZIP_ST;HAVE_TRANSLATE;HAVE_ACCESSIBILITY;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;HAVE_RPNG;HAVE_CORE_INFO_CACHE;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_STB_VORBIS;HAVE_IBXM;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_IFINFO;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_MENU;HAVE_GFX_WIDGETS;HAVE_CONFIGFILE;HAVE_PATCH;HAVE_DSP_FILTER;HAVE_VIDEO_FILTER;HAVE_REWIND;HAVE_SCREENSHOTS;HAVE_CHEATS;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_AUDIOMIXER;HAVE_RWAV;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS;HAVE_CLOUDSYNC;_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING</PreprocessorDefinitions>
136138
</ClCompile>
139+
<PreBuildEvent>
140+
<Command>cd ..\..\..\deps\libsmb2
141+
if not exist build mkdir build
142+
cd build
143+
cmake -G "Visual Studio 17 2022" ..
144+
cmake --build . --config Release
145+
</Command>
146+
</PreBuildEvent>
137147
</ItemDefinitionGroup>
138148
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseANGLE|ARM64'">
139149
<Link>
@@ -168,8 +178,8 @@
168178
</ItemDefinitionGroup>
169179
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
170180
<Link>
171-
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
172-
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(VCInstallDir)\lib\store\amd64;$(VCInstallDir)\lib\amd64;$(MSBuildProjectDirectory)\Mesa\$(Platform)</AdditionalLibraryDirectories>
181+
<AdditionalDependencies>d2d1.lib;d3d11.lib;dxgi.lib;windowscodecs.lib;dwrite.lib;dxguid.lib;smb2.lib;%(AdditionalDependencies)</AdditionalDependencies>
182+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\..\deps\libsmb2\build\lib\Release;%(AdditionalLibraryDirectories);$(VCInstallDir)\lib\store\amd64;$(VCInstallDir)\lib\amd64;$(MSBuildProjectDirectory)\Mesa\$(Platform)</AdditionalLibraryDirectories>
173183
<AdditionalOptions>/nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib %(AdditionalOptions)</AdditionalOptions>
174184
</Link>
175185
<ClCompile>
@@ -178,8 +188,16 @@
178188
<AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\7zip;$(MSBuildProjectDirectory)\..\..\..\deps\dr;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\gfx\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include\MESA;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
179189
<AdditionalOptions>/bigobj %(AdditionalOptions) /utf-8 /await</AdditionalOptions>
180190
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
181-
<PreprocessorDefinitions>WIN32;HAVE_XDELTA;HAVE_MAIN;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_BUILTINGLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_ONLINE_UPDATER;HAVE_UPDATE_ASSETS;HAVE_UPDATE_CORES;HAVE_UPDATE_CORE_INFO;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;HAVE_OPENGL;HAVE_GLSL;HAVE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_CHD;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_7ZIP;_7ZIP_ST;HAVE_TRANSLATE;HAVE_ACCESSIBILITY;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;HAVE_RPNG;HAVE_CORE_INFO_CACHE;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_STB_VORBIS;HAVE_IBXM;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_IFINFO;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_MENU;HAVE_GFX_WIDGETS;HAVE_CONFIGFILE;HAVE_PATCH;HAVE_DSP_FILTER;HAVE_VIDEO_FILTER;HAVE_REWIND;HAVE_SCREENSHOTS;HAVE_CHEATS;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_AUDIOMIXER;HAVE_RWAV;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS;HAVE_CLOUDSYNC;_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING</PreprocessorDefinitions>
191+
<PreprocessorDefinitions>WIN32;HAVE_XDELTA;HAVE_MAIN;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_BUILTINGLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_ONLINE_UPDATER;HAVE_UPDATE_ASSETS;HAVE_UPDATE_CORES;HAVE_UPDATE_CORE_INFO;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;HAVE_OPENGL;HAVE_GLSL;HAVE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_CHD;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_7ZIP;_7ZIP_ST;HAVE_TRANSLATE;HAVE_ACCESSIBILITY;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;HAVE_RPNG;HAVE_CORE_INFO_CACHE;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_STB_VORBIS;HAVE_IBXM;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_IFINFO;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_MENU;HAVE_GFX_WIDGETS;HAVE_CONFIGFILE;HAVE_PATCH;HAVE_DSP_FILTER;HAVE_VIDEO_FILTER;HAVE_REWIND;HAVE_SCREENSHOTS;HAVE_CHEATS;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_AUDIOMIXER;HAVE_RWAV;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS;HAVE_CLOUDSYNC;_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING;HAVE_SMBCLIENT;HAVE_STDINT_H</PreprocessorDefinitions>
182192
</ClCompile>
193+
<PreBuildEvent>
194+
<Command>cd ..\..\..\deps\libsmb2
195+
if not exist build mkdir build
196+
cd build
197+
cmake -G "Visual Studio 17 2022" ..
198+
cmake --build . --config Release
199+
</Command>
200+
</PreBuildEvent>
183201
</ItemDefinitionGroup>
184202
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseANGLE|x64'">
185203
<Link>
@@ -235,6 +253,7 @@
235253
<ClCompile Include="..\..\..\griffin\griffin_glslang.cpp" />
236254
</ItemGroup>
237255
<ItemGroup>
256+
<ClCompile Include="..\..\..\libretro-common\vfs\vfs_implementation_smb.c" />
238257
<ClCompile Include="..\..\..\uwp\uwp_main.cpp" />
239258
</ItemGroup>
240259
<ItemGroup>
@@ -246,6 +265,7 @@
246265
<ClCompile Include="..\..\..\libretro-common\vfs\vfs_implementation_uwp.cpp" />
247266
</ItemGroup>
248267
<ItemGroup>
268+
<ClInclude Include="..\..\..\libretro-common\vfs\vfs_implementation_smb.h" />
249269
<ClInclude Include="..\..\..\uwp\uwp_async.h" />
250270
<ClInclude Include="..\..\..\uwp\uwp_func.h" />
251271
<ClInclude Include="..\..\..\uwp\uwp_main.h" />
@@ -306,6 +326,11 @@
306326
<Link>%(Filename)%(Extension)</Link>
307327
</None>
308328
</ItemGroup>
329+
<ItemGroup>
330+
<Content Include="..\..\..\deps\libsmb2\build\lib\Release\smb2.dll">
331+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
332+
</Content>
333+
</ItemGroup>
309334
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
310335
<Import Project="$(MSBuildProjectDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(MSBuildProjectDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
311336
<ImportGroup Label="ExtensionTargets">

pkg/msvc-uwp/RetroArch-msvcUWP/RetroArch-msvcUWP.vcxproj.filters

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<Filter Include="libretro-common-uwp">
1414
<UniqueIdentifier>{d41660c5-7f5b-442c-b5d7-03e6e9af8172}</UniqueIdentifier>
1515
</Filter>
16+
<Filter Include="libretro-common-smb">
17+
<UniqueIdentifier>{c9702dfa-1bdb-41fb-87e7-a055fb721417}</UniqueIdentifier>
18+
</Filter>
1619
</ItemGroup>
1720
<ItemGroup>
1821
<AppxManifest Include="Package.appxmanifest" />
@@ -35,6 +38,9 @@
3538
<ClInclude Include="..\..\..\uwp\uwp_async.h">
3639
<Filter>uwp</Filter>
3740
</ClInclude>
41+
<ClInclude Include="..\..\..\libretro-common\vfs\vfs_implementation_smb.h">
42+
<Filter>libretro-common-smb</Filter>
43+
</ClInclude>
3844
</ItemGroup>
3945
<ItemGroup>
4046
<ClCompile Include="..\..\..\griffin\griffin.c">
@@ -52,6 +58,9 @@
5258
<ClCompile Include="..\..\..\libretro-common\vfs\vfs_implementation_uwp.cpp">
5359
<Filter>libretro-common-uwp</Filter>
5460
</ClCompile>
61+
<ClCompile Include="..\..\..\libretro-common\vfs\vfs_implementation_smb.c">
62+
<Filter>libretro-common-smb</Filter>
63+
</ClCompile>
5564
</ItemGroup>
5665
<ItemGroup>
5766
<Image Include="Assets\SmallTile.scale-100.png">
@@ -136,4 +145,4 @@
136145
<Filter>Assets</Filter>
137146
</Image>
138147
</ItemGroup>
139-
</Project>
148+
</Project>

0 commit comments

Comments
 (0)