From beba6d14222dc6bec31758d80d50395c783a2ea0 Mon Sep 17 00:00:00 2001
From: TSR Berry <20988865+TSRBerry@users.noreply.github.com>
Date: Thu, 20 Jul 2023 22:42:25 +0200
Subject: [PATCH] Cleanup gitignore and project file structure

---
 .gitignore                                    |  4 +---
 src/LibRyujinx/LibRyujinx.csproj              | 12 +++++------
 src/RyujinxAndroid/.gitignore                 | 21 ++++++++-----------
 src/RyujinxAndroid/app/.gitignore             |  1 -
 .../app/src/main/jniLibs/arm64-v8a/.gitkeep   |  1 +
 .../main/jniLibs/arm64-v8a/insert libs here   |  0
 src/RyujinxAndroid/gradlew                    |  0
 7 files changed, 17 insertions(+), 22 deletions(-)
 delete mode 100644 src/RyujinxAndroid/app/.gitignore
 create mode 100644 src/RyujinxAndroid/app/src/main/jniLibs/arm64-v8a/.gitkeep
 delete mode 100644 src/RyujinxAndroid/app/src/main/jniLibs/arm64-v8a/insert libs here
 mode change 100644 => 100755 src/RyujinxAndroid/gradlew

diff --git a/.gitignore b/.gitignore
index 6b56addcb..b48899e82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@ build/
 *.vssscc
 .builds
 *.pidb
-*.log
 *.scc
 
 # Visual C++ cache files
@@ -173,5 +172,4 @@ PublishProfiles/
 
 # Glade backup files
 *.glade~
-/src/RyujinxAndroid/.idea
-/src/RyujinxAndroid/app/src/main/jniLibs/arm64-v8a
+
diff --git a/src/LibRyujinx/LibRyujinx.csproj b/src/LibRyujinx/LibRyujinx.csproj
index 4f3e97580..f9e7ab255 100644
--- a/src/LibRyujinx/LibRyujinx.csproj
+++ b/src/LibRyujinx/LibRyujinx.csproj
@@ -3,14 +3,14 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <LinkerFlavor Condition="'$(RuntimeIdentifier)'=='linux-bionic-arm64'">lld</LinkerFlavor>
-      <DefineConstants>$(DefineConstants);FORCE_EXTERNAL_BASE_DIR</DefineConstants>
+    <LinkerFlavor Condition="'$(RuntimeIdentifier)'=='linux-bionic-arm64'">lld</LinkerFlavor>
+    <DefineConstants>$(DefineConstants);FORCE_EXTERNAL_BASE_DIR</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
     <PublishAot>true</PublishAot>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
-      <InvariantGlobalization>true</InvariantGlobalization>
+    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+    <InvariantGlobalization>true</InvariantGlobalization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
       <OptimizationPreference>Speed</OptimizationPreference>
@@ -30,7 +30,7 @@
         <RdXmlFile Include="rd.xml" />
     </ItemGroup>
     <ItemGroup>
-		  <PackageReference Include="Rxmxnx.PInvoke.Extensions" />        
+      <PackageReference Include="Rxmxnx.PInvoke.Extensions" />
       <PackageReference Include="Silk.NET.Vulkan" />
       <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />
       <LinkerArg Condition="'$(RuntimeIdentifier)'=='linux-bionic-arm64'" Include="-llog" />
@@ -38,4 +38,4 @@
     <ItemGroup>
       <Folder Include="Jni\" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/RyujinxAndroid/.gitignore b/src/RyujinxAndroid/.gitignore
index aa724b770..314e02c26 100644
--- a/src/RyujinxAndroid/.gitignore
+++ b/src/RyujinxAndroid/.gitignore
@@ -1,15 +1,12 @@
+.idea/
 *.iml
 .gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
 local.properties
+.DS_Store
+build/
+captures
+.externalNativeBuild
+.cxx/
+
+app/src/main/jniLibs/arm64-v8a/**
+!app/src/main/jniLibs/arm64-v8a/.gitkeep
diff --git a/src/RyujinxAndroid/app/.gitignore b/src/RyujinxAndroid/app/.gitignore
deleted file mode 100644
index 42afabfd2..000000000
--- a/src/RyujinxAndroid/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/src/RyujinxAndroid/app/src/main/jniLibs/arm64-v8a/.gitkeep b/src/RyujinxAndroid/app/src/main/jniLibs/arm64-v8a/.gitkeep
new file mode 100644
index 000000000..8d1c8b69c
--- /dev/null
+++ b/src/RyujinxAndroid/app/src/main/jniLibs/arm64-v8a/.gitkeep
@@ -0,0 +1 @@
+ 
diff --git a/src/RyujinxAndroid/app/src/main/jniLibs/arm64-v8a/insert libs here b/src/RyujinxAndroid/app/src/main/jniLibs/arm64-v8a/insert libs here
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/RyujinxAndroid/gradlew b/src/RyujinxAndroid/gradlew
old mode 100644
new mode 100755