From be18828e2f09e25525b27b7696b8db73d58473a5 Mon Sep 17 00:00:00 2001 From: GABO1423 <35014183+GABO1423@users.noreply.github.com> Date: Fri, 25 Aug 2023 00:46:25 -0400 Subject: [PATCH] (UWP) Another Round of Code Cleanups --- UWP/.gitignore | 1 - UWP/Assets/.empty | 0 UWP/AssetsGold/StoreLogo.scale-100.png | Bin 3854 -> 0 bytes UWP/UWP.vcxproj | 568 +++++-------------------- UWP/UWP.vcxproj.filters | 520 ++++------------------ 5 files changed, 176 insertions(+), 913 deletions(-) create mode 100644 UWP/Assets/.empty delete mode 100644 UWP/AssetsGold/StoreLogo.scale-100.png diff --git a/UWP/.gitignore b/UWP/.gitignore index bc18c645d1..2a19bf7d22 100644 --- a/UWP/.gitignore +++ b/UWP/.gitignore @@ -1,7 +1,6 @@ # We copy other files on top of these at build time, depending on configuration (Normal/Gold) Package.appxmanifest -Assets AppPackages x64 ARM diff --git a/UWP/Assets/.empty b/UWP/Assets/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/UWP/AssetsGold/StoreLogo.scale-100.png b/UWP/AssetsGold/StoreLogo.scale-100.png deleted file mode 100644 index 730cc243f331d1b38a0608c59768f68044d30b66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3854 zcmV+p5ApDcP)5u zp?l~%=ZB4b*YAV=-{P|c57avC z4>EmxgyshBp@s2Cye$RKFK&47sEK;#Jiu7!;m%8{uHj#~Jx zrPPEYSfxkr&H>t(b9Dd|8O~6@4TmP}TNXTq8L1O382%p^hWv9az^V8A>P|Ao6RNrc z5M8yW@o#+_<}08008%lKa|3vA5Qv*C#0t^>88)!!N*8bnDsS(nc|esKvV~l>b?ccG zY5qW-umhUR5Fptah@Qw186^b&PeYUeA3@X+ce>pox_Ww4HAnNaXq4A>xrCJ6XDfgP$!}LXaNs5MbVYcLSO|Lfx=7e!E+`* z`gfJj;J$O@?#+!l-Zwkk_Sr}Ei>!E3E8_jrv`F)Co8zn2J&k?gp+g;AEx~biMIyf2u`tJ zs|D03{_tN=C+BTwID0QA%crK+TbeMF{}GuHT4AEoajLvMwVkGjXr%s5U$PMjHh>@R z33c#5HrTZ6dQ;vRVviH=@$`}%^+tLnjA-422)RV-XHct@-{}MkQOi6@`vJ-TW8uAW z0!9ddoFa9Q=|Q-AkbWYfIzbL($bynYgg9m1v)+^6Z=#95C_`Mp?)L;aZYnuv=u2(Dk^*!3eLBNc>Ku`y3KbOL!*vV zn}7a87{=>;1saCvdc7g@t&McoI`;olxVt40=PltflUlOz`tPPjiNBEXBNv*_k2$g@ zFTXfW2Z9}_7ZKI|@k<)c#-8Nv!nsbu`yy3DDwKS%mjU>(qJTYmpA+q>m3WBez4bK6 z&$(<2W#9)k3mt0S4sy@8#S5P{XC@A+Tl<%_&2;(xSPY!ftLdI)RD%n-P3j+H#$H>& zf}LKwQ8WvA#UfQgl;|8nFxN;TcM$V0##7@K4XMSI9ki0Kvx(v{Q4e`%nh2w`&*hft zJ=CZ{GugA-v$F%ICglcIL zDPqk7=adl0d6-+$NlI>b`R7|fbSPC|A1M5dxF#BE1&U(jwt0q!l!=JW_W9J0SAFMK z?s~bxXpwF&+-p2?UZXD_ukrGt>3+pyFGzVwz%zH?#(W@ZOofb*2b&_#-!$*$(E%fY z&q_Pct^G8fJqDX$V8_=ac5h1y@&k+eDbCsNo@QKZ`EXR_e8UNv4kbE|82 zbYs1CVl6stU1Q0k;|*eECz~qc4mH{?j7V_pFfKQEYNqOS0HDeRGJ}DPAK91%6^e{1 zd<=@hrr^dSeU^K+Rf+KXYk{~~;zjSxUoqtJFSJMY>E_5j(-N7d z+eT)%cbuhfP`&=D8FdZAer{#4VP1pw-nQ*pXI(Q5D86F}#Vrfq#VH_uZP_mO!AOx~ zp@?0K%#cMcL{xpEX}gltT4qYko}cX-B9FI&Ce0Ce?gK=P12`W)q?2fiI-oD|uNWfl zvLSM>80BSN?DI$TA0HcvHH4vi$NNmm^)t;X4B|B<$PB7GtDw2_Md@c$gvilQ-~JK> zH@=Da)oyGvBw7+Rucuo%oN68_y0ZmP<^XvKK>D}9t;H4dRG1lxgNC9Y(2N<5N2iBc zzPlp#=~|=V)&2dKzPdUgwkTqTMjky6%9y$A-SO{#@9=jFgXSG~Euc)Wc^!A^tG>Vm zqUFn%m;6&9%+6Zz$PH4?UEs|%AYmhLb76(obVc|C6o*g6Tfa%MJHPJHJ=A4m#F z#z7M^ll56blkO-z4d1o|0MXH-t~AC)k9v-KtwZjDmZL?~hw zp)h)JUWm*1#X@*i_-A{CV6Ka&IWa3YyL~&Y1rgPCcN{*zzdJyk;!s!^zx%

6Qh_+1X+J}Wv1 zgTC83dEn#FtuCsRy}8KPCmN2VOx`QYySww=^9ZXGcP^~8J@f0bIaVu2_vzKOMJo|e zraGf9jOcIFmdYOevN+OpSn$?u$BwSuTe zUD*xmRhsmDDm**{b;L|4{f9yoIvLX4wd~=&Y|uWi@EF+*+u7YaHLERVkN@#67i9!) z-XGz+VzsN|+_9g`?%$n=nlQB(10h<=|2hCD+H=7a#ocv<>bPY(k)}}ni3wBz>~6U0NrolJ`bL zo>Qghv$tW1tM133c3OK#ILKr`e<1 z#5{TtWi?0h*d<>(ioJO0p;zgdTQyt{R3A>;1Yuvt= zKd{{;r{(RHDc?uovcguB>0m-cd>SETO*j4d?Q95q{BWG^!Mb+=BbNl3zw!pO3$?e(zz$&^=-B`6ABF2pkZ|0G{UNS8^YoSaK65l(j3+Dq`j|mZtsYD9J=jz?CDjTJbzj=g+HWslSXx#>x#0Pt|+z9 zl-;yDq^+0Wc`UFm3mw3s2WiC$@=liHgrG0-P7Q+k?j|Ub_ulsSabYWDAF8||+bl*l z<*2L+_WauXpxumNGsgDrL_`gl8jQjJ>LjWD8^7YnNyR~PkmuV+D^if_TMi#VA1yfo z?>lCmcYFnZbryG zGYXoNUEn%9AR^zTeG{sZ zIRNT=+fbaiCwTXU@r^h#RFy}ccc!fxZq4}@C$qqRAX6)}97hEIz*~W<4*r`WdIdN& zpN9EZ^ad_cl^p;SduG)XF51GPprtIZcd1a9cl5@acR1^CGQ{gYdZOU^d~wH+KM2}9 z6HryHA;-U8(39I}h9Y(~8(>^2wp4T}E+S&$AKSx`cX2utF{`xe4!7~0#HW7UnpI>- z&S9FOTXUp%Yh=0&V8Oj~7-|iZxer3l>9Jbx%cCr~F1Csy7Y2w;p;&ARyygf)s!ttl zNL6ymt~r|2-N-pR0Wz3VJP@)uSpsx;3Xir$|Oo{O*TuVr{SU)%2$TH}lW;+e|a# z)cfE~p~?;6dvt?ShnEhwSv96lkIv1sSJMh^3RQoAD copy PackageNormal.appxmanifest Package.appxmanifest /Y - mkdir Assets copy AssetsNormal\*.* Assets /Y - robocopy "..\Assets\." "Content\." /xd "mime" /E /R:0 /W:0 - ../Windows/git-version-gen.cmd - EXIT 0 - - - - - - xinputuap.lib;libavcodec.a;libavformat.a;libavutil.a;libswresample.a;libswscale.a;d2d1.lib;d3d11.lib;dxgi.lib;windowscodecs.lib;dwrite.lib; %(AdditionalDependencies) - ../ffmpeg/Windows10/ARM64/lib;%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm - - - pch.h - $(IntDir)pch.pch - ..;../ext/native;../ext/snappy;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204 - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - pch.h - stdcpp17 - - - - copy PackageNormal.appxmanifest Package.appxmanifest /Y - mkdir Assets - copy AssetsNormal\*.* Assets /Y - robocopy "..\Assets\." "Content\." /xd "mime" /E /R:0 /W:0 ../Windows/git-version-gen.cmd EXIT 0 @@ -156,35 +128,7 @@ copy PackageNormal.appxmanifest Package.appxmanifest /Y - mkdir Assets copy AssetsNormal\*.* Assets /Y - robocopy "..\Assets\." "Content\." /xd "mime" /E /R:0 /W:0 - ../Windows/git-version-gen.cmd - EXIT 0 - - - - - - xinputuap.lib;libavcodec.a;libavformat.a;libavutil.a;libswresample.a;libswscale.a;d2d1.lib;d3d11.lib;dxgi.lib;windowscodecs.lib;dwrite.lib; %(AdditionalDependencies) - ../ffmpeg/Windows10/ARM64/lib;%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm - - - pch.h - $(IntDir)pch.pch - ..;../ext/native;../ext/snappy;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - 4453;28204 - NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - pch.h - stdcpp17 - - - - copy PackageNormal.appxmanifest Package.appxmanifest /Y - mkdir Assets - copy AssetsNormal\*.* Assets /Y - robocopy "..\Assets\." "Content\." /xd "mime" /E /R:0 /W:0 ../Windows/git-version-gen.cmd EXIT 0 @@ -208,9 +152,55 @@ copy PackageGold.appxmanifest Package.appxmanifest /Y - mkdir Assets copy AssetsGold\*.* Assets /Y - robocopy "..\Assets\." "Content\." /xd "mime" /E /R:0 /W:0 + ../Windows/git-version-gen.cmd + EXIT 0 + + + + + + xinputuap.lib;libavcodec.a;libavformat.a;libavutil.a;libswresample.a;libswscale.a;d2d1.lib;d3d11.lib;dxgi.lib;windowscodecs.lib;dwrite.lib; %(AdditionalDependencies) + ../ffmpeg/Windows10/ARM64/lib;%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm + + + pch.h + $(IntDir)pch.pch + ..;../ext/native;../ext/snappy;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + 4453;28204 + _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pch.h + stdcpp17 + + + + copy PackageNormal.appxmanifest Package.appxmanifest /Y + copy AssetsNormal\*.* Assets /Y + ../Windows/git-version-gen.cmd + EXIT 0 + + + + + + xinputuap.lib;libavcodec.a;libavformat.a;libavutil.a;libswresample.a;libswscale.a;d2d1.lib;d3d11.lib;dxgi.lib;windowscodecs.lib;dwrite.lib; %(AdditionalDependencies) + ../ffmpeg/Windows10/ARM64/lib;%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm + + + pch.h + $(IntDir)pch.pch + ..;../ext/native;../ext/snappy;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + 4453;28204 + NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pch.h + stdcpp17 + + + + copy PackageNormal.appxmanifest Package.appxmanifest /Y + copy AssetsNormal\*.* Assets /Y ../Windows/git-version-gen.cmd EXIT 0 @@ -234,9 +224,7 @@ copy PackageGold.appxmanifest Package.appxmanifest /Y - mkdir Assets copy AssetsGold\*.* Assets /Y - robocopy "..\Assets\." "Content\." /xd "mime" /E /R:0 /W:0 ../Windows/git-version-gen.cmd EXIT 0 @@ -260,9 +248,7 @@ copy PackageNormal.appxmanifest Package.appxmanifest /Y - mkdir Assets copy AssetsNormal\*.* Assets /Y - robocopy "..\Assets\." "Content\." /xd "mime" /E /R:0 /W:0 ../Windows/git-version-gen.cmd EXIT 0 @@ -286,9 +272,7 @@ copy PackageNormal.appxmanifest Package.appxmanifest /Y - mkdir Assets copy AssetsNormal\*.* Assets /Y - robocopy "..\Assets\." "Content\." /xd "mime" /E /R:0 /W:0 ../Windows/git-version-gen.cmd EXIT 0 @@ -312,17 +296,19 @@ copy PackageGold.appxmanifest Package.appxmanifest /Y - mkdir Assets copy AssetsGold\*.* Assets /Y - robocopy "..\Assets\." "Content\." /xd "mime" /E /R:0 /W:0 ../Windows/git-version-gen.cmd EXIT 0 - - false + + Designer + Document + + + True true @@ -339,27 +325,9 @@ true - - true - true - - true - - - true - - - true - - - true - - - true - @@ -402,81 +370,34 @@ - - Designer - Document - - + true - Document + Content\%(Filename)%(Extension) - + + true + Content\debugger\%(Filename)%(Extension) + + true Document + Content\%(Filename)%(Extension) - - true - Document - - + true + Content\vfpu\%(Filename)%(Extension) - + true + Content\debugger\%(Filename)%(Extension) - + true + Content\debugger\%(Filename)%(Extension) - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - + true + Content\debugger\%(Filename)%(Extension) true @@ -498,347 +419,53 @@ true Content\debugger\static\media\%(Filename)%(Extension) - + true + Content\%(Filename)%(Extension) - + true + Content\themes\%(Filename)%(Extension) - + true + Content\%(Filename)%(Extension) - + true + Content\%(Filename)%(Extension) - + true + Content\flash0\font\%(Filename)%(Extension) - + true + Content\%(Filename)%(Extension) - + true + Content\%(Filename)%(Extension) - + true + Content\lang\%(Filename)%(Extension) - + true + Content\shaders\%(Filename)%(Extension) - + true + Content\shaders\%(Filename)%(Extension) - + true + Content\shaders\%(Filename)%(Extension) - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - + true + Content\shaders\%(Filename)%(Extension) @@ -879,12 +506,15 @@ true Content\debugger\static\js\%(Filename)%(Extension) - + true + Content\%(Filename)%(Extension) - + + Content\%(Filename)%(Extension) + diff --git a/UWP/UWP.vcxproj.filters b/UWP/UWP.vcxproj.filters index 69fd40a3c1..7433f4459a 100644 --- a/UWP/UWP.vcxproj.filters +++ b/UWP/UWP.vcxproj.filters @@ -1,22 +1,67 @@  - - 0d070030-beb5-4f48-99a0-b1777297a468 - - - 8d1bdedf-c546-4b7a-8aa7-e490c4e8ad60 - 68b36d2a-4f4a-48a5-8b8f-cb15af108c93 + + a5564d79-b131-4b27-9f5f-d80671731d94 + + + 0d070030-beb5-4f48-99a0-b1777297a468 + 5964c8ad-590e-4b46-84f2-067602f4f231 - - a5564d79-b131-4b27-9f5f-d80671731d94 - bmp;fbx;gif;jpg;jpeg;tga;tiff;tif;png + + 8d1bdedf-c546-4b7a-8aa7-e490c4e8ad60 + + {ef87b390-608f-4c6d-a0ad-88963875ed11} + wav;zim;ini;txt;ttf;png;meta + + + {0c1cdb21-de65-4a10-962e-46b9bb0ff717} + ini + + + {a861f712-3285-448d-b7a0-f6d39ac4c4b9} + vsh;fsh;csh;ini + + + {d51ae335-1279-4484-bfbf-2caa2efba6d9} + + + {d2294c79-82bd-470f-b984-f838f0fbcd25} + pgf + + + {da2113a6-e616-4fc9-8be3-ff75b963664b} + + + {55147387-68fc-487e-abed-7a763f850ef1} + json;ico;html + + + {e5d2759b-3511-4ab9-a9ca-070dd9715f3b} + + + {0fb972a9-20a9-4eba-be70-c408f9306939} + css;map + + + {47d54a48-ca53-4d57-8bfd-9c86fd97d84b} + js;map;txt + + + {83476056-57b8-409f-b729-754d6401e3d5} + + + {eebef4bc-52b6-460d-946d-c70c8a4ee337} + dat + + + UWPHelpers @@ -68,42 +113,6 @@ Assets - - {ef87b390-608f-4c6d-a0ad-88963875ed11} - - - {0c1cdb21-de65-4a10-962e-46b9bb0ff717} - - - {a861f712-3285-448d-b7a0-f6d39ac4c4b9} - - - {d51ae335-1279-4484-bfbf-2caa2efba6d9} - - - {d2294c79-82bd-470f-b984-f838f0fbcd25} - - - {da2113a6-e616-4fc9-8be3-ff75b963664b} - - - {55147387-68fc-487e-abed-7a763f850ef1} - - - {e5d2759b-3511-4ab9-a9ca-070dd9715f3b} - - - {0fb972a9-20a9-4eba-be70-c408f9306939} - - - {47d54a48-ca53-4d57-8bfd-9c86fd97d84b} - - - {83476056-57b8-409f-b729-754d6401e3d5} - - - {eebef4bc-52b6-460d-946d-c70c8a4ee337} - @@ -153,34 +162,7 @@ - - Assets - - - Content - - - Content - - - Content - - - Content - - - Content - - - Assets - - - Content - - - Content - - + Content\debugger @@ -188,362 +170,56 @@ - + + Content + + Content - + Content - + Content - + Content - + Content\lang - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - - Content\lang - - + Content\shaders - + Content\shaders - + Content\shaders - + Content\shaders - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - - Content\shaders - - + Content\flash0\font - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - - Content\flash0\font - - + Content - - Content - - + Content\themes - + Content - - Content - - - Content - - - Content - - - Content - - - Content - - - Content - - - Content - - - Content - - - Content\shaders - - - Content\shaders - - + Content\debugger - + Content\debugger - - Content\debugger - - + Content\debugger @@ -561,54 +237,12 @@ Content\debugger\static\media - - Content\vfpu - - - Content\vfpu - - - Content\vfpu - - - Content\vfpu - - - Content\vfpu - - - Content\vfpu - - - Content\vfpu - - - Content\vfpu - - - Content\vfpu - - - Content\vfpu - - - Content\vfpu - - - Content\vfpu - - - Content\vfpu - - - Content\vfpu - - + Content\vfpu - + Content @@ -616,7 +250,7 @@ - + Content