Skip to content

Commit 3d7eace

Browse files
committed
uwp: update project files for smb client
1 parent b4be5f5 commit 3d7eace

File tree

3 files changed

+34
-4
lines changed

3 files changed

+34
-4
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" />
@@ -35,5 +35,6 @@
3535
<rescap:Capability Name="runFullTrust"/>
3636
<rescap:Capability Name="broadFileSystemAccess" />
3737
<rescap:Capability Name="expandedResources" />
38+
<Capability Name="privateNetworkClientServer"/>
3839
</Capabilities>
3940
</Package>

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@
8181
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
8282
<PackageCertificateKeyFile>RetroArch-msvcUWP_TemporaryKey.pfx</PackageCertificateKeyFile>
8383
</PropertyGroup>
84+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
85+
<IncludePath>C:\Users\Craig\Developer\RetroArch\deps\libsmb2\include;$(IncludePath)</IncludePath>
86+
<LibraryPath>C:\Users\Craig\Developer\RetroArch\deps\libsmb2\build\lib\Release;$(LibraryPath)</LibraryPath>
87+
</PropertyGroup>
8488
<ItemDefinitionGroup>
8589
<ClCompile>
8690
<CompileAsWinRT>false</CompileAsWinRT>
@@ -168,8 +172,8 @@
168172
</ItemDefinitionGroup>
169173
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
170174
<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>
175+
<AdditionalDependencies>d2d1.lib;d3d11.lib;dxgi.lib;windowscodecs.lib;dwrite.lib;dxguid.lib;smb2.lib;%(AdditionalDependencies)</AdditionalDependencies>
176+
<AdditionalLibraryDirectories>C:\Users\Craig\Developer\RetroArch\deps\libsmb2\build\lib\Release;%(AdditionalLibraryDirectories);$(VCInstallDir)\lib\store\amd64;$(VCInstallDir)\lib\amd64;$(MSBuildProjectDirectory)\Mesa\$(Platform)</AdditionalLibraryDirectories>
173177
<AdditionalOptions>/nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib %(AdditionalOptions)</AdditionalOptions>
174178
</Link>
175179
<ClCompile>
@@ -178,7 +182,7 @@
178182
<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>
179183
<AdditionalOptions>/bigobj %(AdditionalOptions) /utf-8 /await</AdditionalOptions>
180184
<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>
185+
<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>
182186
</ClCompile>
183187
</ItemDefinitionGroup>
184188
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseANGLE|x64'">
@@ -235,6 +239,7 @@
235239
<ClCompile Include="..\..\..\griffin\griffin_glslang.cpp" />
236240
</ItemGroup>
237241
<ItemGroup>
242+
<ClCompile Include="..\..\..\libretro-common\vfs\vfs_implementation_smb.c" />
238243
<ClCompile Include="..\..\..\uwp\uwp_main.cpp" />
239244
</ItemGroup>
240245
<ItemGroup>
@@ -246,6 +251,7 @@
246251
<ClCompile Include="..\..\..\libretro-common\vfs\vfs_implementation_uwp.cpp" />
247252
</ItemGroup>
248253
<ItemGroup>
254+
<ClInclude Include="..\..\..\libretro-common\vfs\vfs_implementation_smb.h" />
249255
<ClInclude Include="..\..\..\uwp\uwp_async.h" />
250256
<ClInclude Include="..\..\..\uwp\uwp_func.h" />
251257
<ClInclude Include="..\..\..\uwp\uwp_main.h" />
@@ -306,6 +312,11 @@
306312
<Link>%(Filename)%(Extension)</Link>
307313
</None>
308314
</ItemGroup>
315+
<ItemGroup>
316+
<Content Include="..\..\..\deps\libsmb2\build\lib\Release\smb2.dll">
317+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
318+
</Content>
319+
</ItemGroup>
309320
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
310321
<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')" />
311322
<ImportGroup Label="ExtensionTargets">

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

Lines changed: 18 additions & 0 deletions
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="smb">
17+
<UniqueIdentifier>{c9702dfa-1bdb-41fb-87e7-a055fb721417}</UniqueIdentifier>
18+
</Filter>
1619
</ItemGroup>
1720
<ItemGroup>
1821
<AppxManifest Include="Package.appxmanifest" />
@@ -24,6 +27,15 @@
2427
<None Include="RetroArch-msvcUWP_TemporaryKey.pfx" />
2528
<None Include="ANGLE\$(Platform)\*.dll" />
2629
<None Include="MESA\$(Platform)\*.dll" />
30+
<None Include="MESA\$(Platform)\*.dll" />
31+
<None Include="MESA\$(Platform)\*.dll" />
32+
<None Include="MESA\$(Platform)\*.dll" />
33+
<None Include="MESA\$(Platform)\*.dll" />
34+
<None Include="MESA\$(Platform)\*.dll" />
35+
<None Include="MESA\$(Platform)\*.dll" />
36+
<None Include="MESA\$(Platform)\*.dll" />
37+
<None Include="MESA\$(Platform)\*.dll" />
38+
<None Include="MESA\$(Platform)\*.dll" />
2739
</ItemGroup>
2840
<ItemGroup>
2941
<ClInclude Include="..\..\..\uwp\uwp_func.h">
@@ -35,6 +47,9 @@
3547
<ClInclude Include="..\..\..\uwp\uwp_async.h">
3648
<Filter>uwp</Filter>
3749
</ClInclude>
50+
<ClInclude Include="..\..\..\libretro-common\vfs\vfs_implementation_smb.h">
51+
<Filter>smb</Filter>
52+
</ClInclude>
3853
</ItemGroup>
3954
<ItemGroup>
4055
<ClCompile Include="..\..\..\griffin\griffin.c">
@@ -52,6 +67,9 @@
5267
<ClCompile Include="..\..\..\libretro-common\vfs\vfs_implementation_uwp.cpp">
5368
<Filter>libretro-common-uwp</Filter>
5469
</ClCompile>
70+
<ClCompile Include="..\..\..\libretro-common\vfs\vfs_implementation_smb.c">
71+
<Filter>smb</Filter>
72+
</ClCompile>
5573
</ItemGroup>
5674
<ItemGroup>
5775
<Image Include="Assets\SmallTile.scale-100.png">

0 commit comments

Comments
 (0)