[Core] [Nix] Restructure folders and add Linux docs, Fix nix builds

xenon-emu · Mar 4, 2025 · d80b631 · d80b631
1 parent a2bd1d3
commit d80b631
Show file tree

Hide file tree

Showing 73 changed files with 21 additions and 14 deletions.
diff --git a/Deps/Building/building-linux-nix.md b/Deps/Building/building-linux-nix.md
@@ -0,0 +1,2 @@
+# Compiling Xenon with Nix
+TODO
diff --git a/Deps/Building/building-linux-ubuntu.md b/Deps/Building/building-linux-ubuntu.md
@@ -0,0 +1,2 @@
+# Compiling Xenon with Ubuntu
+TODO
diff --git a/Deps/Building/building-linux.md b/Deps/Building/building-linux.md
@@ -0,0 +1,4 @@
+# Building Xenon for Linux
+### Currently, we only offically support 2 ways to do it.
+## [**Nix**](https://github.com/xenon-emu/Xenon/blob/main/Deps/Building/building-linux-nix.md)
+## [**Ubuntu**](https://github.com/xenon-emu/Xenon/blob/main/Deps/Building/building-linux-ubuntu.md)
diff --git a/Docs/Building/building-windows.md → Deps/Building/building-windows.md b/Docs/Building/building-windows.md → Deps/Building/building-windows.md
@@ -1,4 +1,4 @@
-# Compile Xenon with Visual Studio 2022
+# Compiling Xenon with Visual Studio 2022
 
 ### (Prerequisite) Download [**Git for Windows**](https://git-scm.com/download/win)
 

diff --git a/Docs/CBEA_v1.01_3Oct2006.pdf → Deps/Docs/CBEA_v1.01_3Oct2006.pdf b/Docs/CBEA_v1.01_3Oct2006.pdf → Deps/Docs/CBEA_v1.01_3Oct2006.pdf
diff --git a/Docs/CBE_Public_Registers.v1_5.02APR2007.pdf → ...s/CBE_Public_Registers.v1_5.02APR2007.pdf b/Docs/CBE_Public_Registers.v1_5.02APR2007.pdf → ...s/CBE_Public_Registers.v1_5.02APR2007.pdf
diff --git a/Docs/IBM_CBE_Handbook_v1.1_24APR2007_pub.pdf → ...s/IBM_CBE_Handbook_v1.1_24APR2007_pub.pdf b/Docs/IBM_CBE_Handbook_v1.1_24APR2007_pub.pdf → ...s/IBM_CBE_Handbook_v1.1_24APR2007_pub.pdf
diff --git a/Docs/IBM_CellBE_HIG_65nm_v1.01_8Jun2007.pdf → ...cs/IBM_CellBE_HIG_65nm_v1.01_8Jun2007.pdf b/Docs/IBM_CellBE_HIG_65nm_v1.01_8Jun2007.pdf → ...cs/IBM_CellBE_HIG_65nm_v1.01_8Jun2007.pdf
diff --git a/Docs/Language_Extensions_for_CBEA_2.4.pdf → ...Docs/Language_Extensions_for_CBEA_2.4.pdf b/Docs/Language_Extensions_for_CBEA_2.4.pdf → ...Docs/Language_Extensions_for_CBEA_2.4.pdf
diff --git a/Docs/PPC_Vers202_Book1_public.pdf → Deps/Docs/PPC_Vers202_Book1_public.pdf b/Docs/PPC_Vers202_Book1_public.pdf → Deps/Docs/PPC_Vers202_Book1_public.pdf
diff --git a/Docs/PPC_Vers202_Book2_public.pdf → Deps/Docs/PPC_Vers202_Book2_public.pdf b/Docs/PPC_Vers202_Book2_public.pdf → Deps/Docs/PPC_Vers202_Book2_public.pdf
diff --git a/Docs/PPC_Vers202_Book3_public.pdf → Deps/Docs/PPC_Vers202_Book3_public.pdf b/Docs/PPC_Vers202_Book3_public.pdf → Deps/Docs/PPC_Vers202_Book3_public.pdf
diff --git a/Docs/Xbox 360 Overview.pdf → Deps/Docs/Xbox 360 Overview.pdf b/Docs/Xbox 360 Overview.pdf → Deps/Docs/Xbox 360 Overview.pdf
diff --git a/Docs/screenshots/1BL_Boot.png → Deps/Screenshots/1BL_Boot.png b/Docs/screenshots/1BL_Boot.png → Deps/Screenshots/1BL_Boot.png
diff --git a/Docs/screenshots/WinDBG.png → Deps/Screenshots/WinDBG.png b/Docs/screenshots/WinDBG.png → Deps/Screenshots/WinDBG.png
diff --git a/Docs/screenshots/Xell_Reloaded.png → Deps/Screenshots/Xell_Reloaded.png b/Docs/screenshots/Xell_Reloaded.png → Deps/Screenshots/Xell_Reloaded.png
diff --git a/Docs/fonts/Roboto-Black.ttf → Deps/fonts/Roboto-Black.ttf b/Docs/fonts/Roboto-Black.ttf → Deps/fonts/Roboto-Black.ttf
diff --git a/Docs/fonts/Roboto-BlackItalic.ttf → Deps/fonts/Roboto-BlackItalic.ttf b/Docs/fonts/Roboto-BlackItalic.ttf → Deps/fonts/Roboto-BlackItalic.ttf
diff --git a/Docs/fonts/Roboto-Bold.ttf → Deps/fonts/Roboto-Bold.ttf b/Docs/fonts/Roboto-Bold.ttf → Deps/fonts/Roboto-Bold.ttf
diff --git a/Docs/fonts/Roboto-BoldItalic.ttf → Deps/fonts/Roboto-BoldItalic.ttf b/Docs/fonts/Roboto-BoldItalic.ttf → Deps/fonts/Roboto-BoldItalic.ttf
diff --git a/Docs/fonts/Roboto-ExtraBold.ttf → Deps/fonts/Roboto-ExtraBold.ttf b/Docs/fonts/Roboto-ExtraBold.ttf → Deps/fonts/Roboto-ExtraBold.ttf
diff --git a/Docs/fonts/Roboto-ExtraBoldItalic.ttf → Deps/fonts/Roboto-ExtraBoldItalic.ttf b/Docs/fonts/Roboto-ExtraBoldItalic.ttf → Deps/fonts/Roboto-ExtraBoldItalic.ttf
diff --git a/Docs/fonts/Roboto-ExtraLight.ttf → Deps/fonts/Roboto-ExtraLight.ttf b/Docs/fonts/Roboto-ExtraLight.ttf → Deps/fonts/Roboto-ExtraLight.ttf
diff --git a/Docs/fonts/Roboto-ExtraLightItalic.ttf → Deps/fonts/Roboto-ExtraLightItalic.ttf b/Docs/fonts/Roboto-ExtraLightItalic.ttf → Deps/fonts/Roboto-ExtraLightItalic.ttf
diff --git a/Docs/fonts/Roboto-Italic.ttf → Deps/fonts/Roboto-Italic.ttf b/Docs/fonts/Roboto-Italic.ttf → Deps/fonts/Roboto-Italic.ttf
diff --git a/Docs/fonts/Roboto-Light.ttf → Deps/fonts/Roboto-Light.ttf b/Docs/fonts/Roboto-Light.ttf → Deps/fonts/Roboto-Light.ttf
diff --git a/Docs/fonts/Roboto-LightItalic.ttf → Deps/fonts/Roboto-LightItalic.ttf b/Docs/fonts/Roboto-LightItalic.ttf → Deps/fonts/Roboto-LightItalic.ttf
diff --git a/Docs/fonts/Roboto-Medium.ttf → Deps/fonts/Roboto-Medium.ttf b/Docs/fonts/Roboto-Medium.ttf → Deps/fonts/Roboto-Medium.ttf
diff --git a/Docs/fonts/Roboto-MediumItalic.ttf → Deps/fonts/Roboto-MediumItalic.ttf b/Docs/fonts/Roboto-MediumItalic.ttf → Deps/fonts/Roboto-MediumItalic.ttf
diff --git a/Docs/fonts/Roboto-Regular.ttf → Deps/fonts/Roboto-Regular.ttf b/Docs/fonts/Roboto-Regular.ttf → Deps/fonts/Roboto-Regular.ttf
diff --git a/Docs/fonts/Roboto-SemiBold.ttf → Deps/fonts/Roboto-SemiBold.ttf b/Docs/fonts/Roboto-SemiBold.ttf → Deps/fonts/Roboto-SemiBold.ttf
diff --git a/Docs/fonts/Roboto-SemiBoldItalic.ttf → Deps/fonts/Roboto-SemiBoldItalic.ttf b/Docs/fonts/Roboto-SemiBoldItalic.ttf → Deps/fonts/Roboto-SemiBoldItalic.ttf
diff --git a/Docs/fonts/Roboto-Thin.ttf → Deps/fonts/Roboto-Thin.ttf b/Docs/fonts/Roboto-Thin.ttf → Deps/fonts/Roboto-Thin.ttf
diff --git a/Docs/fonts/Roboto-ThinItalic.ttf → Deps/fonts/Roboto-ThinItalic.ttf b/Docs/fonts/Roboto-ThinItalic.ttf → Deps/fonts/Roboto-ThinItalic.ttf
diff --git a/Docs/fonts/Roboto_Condensed-Black.ttf → Deps/fonts/Roboto_Condensed-Black.ttf b/Docs/fonts/Roboto_Condensed-Black.ttf → Deps/fonts/Roboto_Condensed-Black.ttf
diff --git a/Docs/fonts/Roboto_Condensed-BlackItalic.ttf → Deps/fonts/Roboto_Condensed-BlackItalic.ttf b/Docs/fonts/Roboto_Condensed-BlackItalic.ttf → Deps/fonts/Roboto_Condensed-BlackItalic.ttf
diff --git a/Docs/fonts/Roboto_Condensed-Bold.ttf → Deps/fonts/Roboto_Condensed-Bold.ttf b/Docs/fonts/Roboto_Condensed-Bold.ttf → Deps/fonts/Roboto_Condensed-Bold.ttf
diff --git a/Docs/fonts/Roboto_Condensed-BoldItalic.ttf → Deps/fonts/Roboto_Condensed-BoldItalic.ttf b/Docs/fonts/Roboto_Condensed-BoldItalic.ttf → Deps/fonts/Roboto_Condensed-BoldItalic.ttf
diff --git a/Docs/fonts/Roboto_Condensed-ExtraBold.ttf → Deps/fonts/Roboto_Condensed-ExtraBold.ttf b/Docs/fonts/Roboto_Condensed-ExtraBold.ttf → Deps/fonts/Roboto_Condensed-ExtraBold.ttf
diff --git a/...onts/Roboto_Condensed-ExtraBoldItalic.ttf → ...onts/Roboto_Condensed-ExtraBoldItalic.ttf b/...onts/Roboto_Condensed-ExtraBoldItalic.ttf → ...onts/Roboto_Condensed-ExtraBoldItalic.ttf
diff --git a/Docs/fonts/Roboto_Condensed-ExtraLight.ttf → Deps/fonts/Roboto_Condensed-ExtraLight.ttf b/Docs/fonts/Roboto_Condensed-ExtraLight.ttf → Deps/fonts/Roboto_Condensed-ExtraLight.ttf
diff --git a/...nts/Roboto_Condensed-ExtraLightItalic.ttf → ...nts/Roboto_Condensed-ExtraLightItalic.ttf b/...nts/Roboto_Condensed-ExtraLightItalic.ttf → ...nts/Roboto_Condensed-ExtraLightItalic.ttf
diff --git a/Docs/fonts/Roboto_Condensed-Italic.ttf → Deps/fonts/Roboto_Condensed-Italic.ttf b/Docs/fonts/Roboto_Condensed-Italic.ttf → Deps/fonts/Roboto_Condensed-Italic.ttf
diff --git a/Docs/fonts/Roboto_Condensed-Light.ttf → Deps/fonts/Roboto_Condensed-Light.ttf b/Docs/fonts/Roboto_Condensed-Light.ttf → Deps/fonts/Roboto_Condensed-Light.ttf
diff --git a/Docs/fonts/Roboto_Condensed-LightItalic.ttf → Deps/fonts/Roboto_Condensed-LightItalic.ttf b/Docs/fonts/Roboto_Condensed-LightItalic.ttf → Deps/fonts/Roboto_Condensed-LightItalic.ttf
diff --git a/Docs/fonts/Roboto_Condensed-Medium.ttf → Deps/fonts/Roboto_Condensed-Medium.ttf b/Docs/fonts/Roboto_Condensed-Medium.ttf → Deps/fonts/Roboto_Condensed-Medium.ttf
diff --git a/Docs/fonts/Roboto_Condensed-MediumItalic.ttf → Deps/fonts/Roboto_Condensed-MediumItalic.ttf b/Docs/fonts/Roboto_Condensed-MediumItalic.ttf → Deps/fonts/Roboto_Condensed-MediumItalic.ttf
diff --git a/Docs/fonts/Roboto_Condensed-Regular.ttf → Deps/fonts/Roboto_Condensed-Regular.ttf b/Docs/fonts/Roboto_Condensed-Regular.ttf → Deps/fonts/Roboto_Condensed-Regular.ttf
diff --git a/Docs/fonts/Roboto_Condensed-SemiBold.ttf → Deps/fonts/Roboto_Condensed-SemiBold.ttf b/Docs/fonts/Roboto_Condensed-SemiBold.ttf → Deps/fonts/Roboto_Condensed-SemiBold.ttf
diff --git a/...fonts/Roboto_Condensed-SemiBoldItalic.ttf → ...fonts/Roboto_Condensed-SemiBoldItalic.ttf b/...fonts/Roboto_Condensed-SemiBoldItalic.ttf → ...fonts/Roboto_Condensed-SemiBoldItalic.ttf
diff --git a/Docs/fonts/Roboto_Condensed-Thin.ttf → Deps/fonts/Roboto_Condensed-Thin.ttf b/Docs/fonts/Roboto_Condensed-Thin.ttf → Deps/fonts/Roboto_Condensed-Thin.ttf
diff --git a/Docs/fonts/Roboto_Condensed-ThinItalic.ttf → Deps/fonts/Roboto_Condensed-ThinItalic.ttf b/Docs/fonts/Roboto_Condensed-ThinItalic.ttf → Deps/fonts/Roboto_Condensed-ThinItalic.ttf
diff --git a/Docs/fonts/Roboto_SemiCondensed-Black.ttf → Deps/fonts/Roboto_SemiCondensed-Black.ttf b/Docs/fonts/Roboto_SemiCondensed-Black.ttf → Deps/fonts/Roboto_SemiCondensed-Black.ttf
diff --git a/...onts/Roboto_SemiCondensed-BlackItalic.ttf → ...onts/Roboto_SemiCondensed-BlackItalic.ttf b/...onts/Roboto_SemiCondensed-BlackItalic.ttf → ...onts/Roboto_SemiCondensed-BlackItalic.ttf
diff --git a/Docs/fonts/Roboto_SemiCondensed-Bold.ttf → Deps/fonts/Roboto_SemiCondensed-Bold.ttf b/Docs/fonts/Roboto_SemiCondensed-Bold.ttf → Deps/fonts/Roboto_SemiCondensed-Bold.ttf
diff --git a/...fonts/Roboto_SemiCondensed-BoldItalic.ttf → ...fonts/Roboto_SemiCondensed-BoldItalic.ttf b/...fonts/Roboto_SemiCondensed-BoldItalic.ttf → ...fonts/Roboto_SemiCondensed-BoldItalic.ttf
diff --git a/.../fonts/Roboto_SemiCondensed-ExtraBold.ttf → .../fonts/Roboto_SemiCondensed-ExtraBold.ttf b/.../fonts/Roboto_SemiCondensed-ExtraBold.ttf → .../fonts/Roboto_SemiCondensed-ExtraBold.ttf
diff --git a/.../Roboto_SemiCondensed-ExtraBoldItalic.ttf → .../Roboto_SemiCondensed-ExtraBoldItalic.ttf b/.../Roboto_SemiCondensed-ExtraBoldItalic.ttf → .../Roboto_SemiCondensed-ExtraBoldItalic.ttf
diff --git a/...fonts/Roboto_SemiCondensed-ExtraLight.ttf → ...fonts/Roboto_SemiCondensed-ExtraLight.ttf b/...fonts/Roboto_SemiCondensed-ExtraLight.ttf → ...fonts/Roboto_SemiCondensed-ExtraLight.ttf
diff --git a/...Roboto_SemiCondensed-ExtraLightItalic.ttf → ...Roboto_SemiCondensed-ExtraLightItalic.ttf b/...Roboto_SemiCondensed-ExtraLightItalic.ttf → ...Roboto_SemiCondensed-ExtraLightItalic.ttf
diff --git a/Docs/fonts/Roboto_SemiCondensed-Italic.ttf → Deps/fonts/Roboto_SemiCondensed-Italic.ttf b/Docs/fonts/Roboto_SemiCondensed-Italic.ttf → Deps/fonts/Roboto_SemiCondensed-Italic.ttf
diff --git a/Docs/fonts/Roboto_SemiCondensed-Light.ttf → Deps/fonts/Roboto_SemiCondensed-Light.ttf b/Docs/fonts/Roboto_SemiCondensed-Light.ttf → Deps/fonts/Roboto_SemiCondensed-Light.ttf
diff --git a/...onts/Roboto_SemiCondensed-LightItalic.ttf → ...onts/Roboto_SemiCondensed-LightItalic.ttf b/...onts/Roboto_SemiCondensed-LightItalic.ttf → ...onts/Roboto_SemiCondensed-LightItalic.ttf
diff --git a/Docs/fonts/Roboto_SemiCondensed-Medium.ttf → Deps/fonts/Roboto_SemiCondensed-Medium.ttf b/Docs/fonts/Roboto_SemiCondensed-Medium.ttf → Deps/fonts/Roboto_SemiCondensed-Medium.ttf
diff --git a/...nts/Roboto_SemiCondensed-MediumItalic.ttf → ...nts/Roboto_SemiCondensed-MediumItalic.ttf b/...nts/Roboto_SemiCondensed-MediumItalic.ttf → ...nts/Roboto_SemiCondensed-MediumItalic.ttf
diff --git a/Docs/fonts/Roboto_SemiCondensed-Regular.ttf → Deps/fonts/Roboto_SemiCondensed-Regular.ttf b/Docs/fonts/Roboto_SemiCondensed-Regular.ttf → Deps/fonts/Roboto_SemiCondensed-Regular.ttf
diff --git a/Docs/fonts/Roboto_SemiCondensed-SemiBold.ttf → Deps/fonts/Roboto_SemiCondensed-SemiBold.ttf b/Docs/fonts/Roboto_SemiCondensed-SemiBold.ttf → Deps/fonts/Roboto_SemiCondensed-SemiBold.ttf
diff --git a/...s/Roboto_SemiCondensed-SemiBoldItalic.ttf → ...s/Roboto_SemiCondensed-SemiBoldItalic.ttf b/...s/Roboto_SemiCondensed-SemiBoldItalic.ttf → ...s/Roboto_SemiCondensed-SemiBoldItalic.ttf
diff --git a/Docs/fonts/Roboto_SemiCondensed-Thin.ttf → Deps/fonts/Roboto_SemiCondensed-Thin.ttf b/Docs/fonts/Roboto_SemiCondensed-Thin.ttf → Deps/fonts/Roboto_SemiCondensed-Thin.ttf
diff --git a/...fonts/Roboto_SemiCondensed-ThinItalic.ttf → ...fonts/Roboto_SemiCondensed-ThinItalic.ttf b/...fonts/Roboto_SemiCondensed-ThinItalic.ttf → ...fonts/Roboto_SemiCondensed-ThinItalic.ttf
diff --git a/README.md b/README.md
@@ -17,8 +17,8 @@
 
 <p align="center">
   <a href="https://discord.gg/TDvbdXRRQ6">
-  <img src="https://github.com/xenon-emu/Xenon/blob/main/Docs/screenshots/Xell_Reloaded.png" width="450">
-  <img src="https://github.com/xenon-emu/Xenon/blob/main/Docs/screenshots/WinDBG.png" width="510">
+  <img src="https://github.com/xenon-emu/Xenon/blob/main/Deps/Screenshots/Xell_Reloaded.png" width="450">
+  <img src="https://github.com/xenon-emu/Xenon/blob/main/Deps/Screenshots/WinDBG.png" width="510">
 </p>
 
 # Xenon
@@ -40,7 +40,9 @@ We need talented developers more than ever to contribute to the project and move
 </a>
 
 # Building
-Check the build instructions for [**Windows**](https://github.com/xenon-emu/Xenon/blob/main/Docs/Building/building-windows.md).
+#### [**Windows**](https://github.com/xenon-emu/Xenon/blob/main/Deps/Building/building-windows.md)
+####
+#### [**Linux**](https://github.com/xenon-emu/Xenon/blob/main/Deps/Building/building-linux.md)
 
 # License
 - [**GPL-2.0 license**](https://github.com/xenon-emu/Xenon/blob/main/LICENSE)
diff --git a/Xenon/Base/Config.cpp b/Xenon/Base/Config.cpp
@@ -229,18 +229,14 @@ void saveConfig(const std::filesystem::path &path) {
   std::string pathPrefix{};
 #else
   // TODO(Vali0004): Pull if Linux or MacOS
-  std::string pathPrefix{ std::getenv("HOME") };
+  std::string pathPrefix{ getenv("HOME") };
 #endif
+  // Paths.                
   // Append a prefix if we need it (ex. Linux)
-  fusesTxtPath = pathPrefix + fusesTxtPath;
-  oneBlBinPath = pathPrefix + oneBlBinPath;
-  nandBinPath = pathPrefix + nandBinPath;
-  oddDiscImagePath = pathPrefix + oddDiscImagePath;
-  // Paths.
-  data["Paths"]["Fuses"] = fusesTxtPath;
-  data["Paths"]["OneBL"] = oneBlBinPath;
-  data["Paths"]["Nand"] = nandBinPath;
-  data["Paths"]["ODDImage"] = oddDiscImagePath;
+  data["Paths"]["Fuses"] = pathPrefix + fusesTxtPath;
+  data["Paths"]["OneBL"] = pathPrefix + oneBlBinPath;
+  data["Paths"]["Nand"] = pathPrefix + nandBinPath;
+  data["Paths"]["ODDImage"] = pathPrefix + oddDiscImagePath;
 
   // HighlyExperimental.
   data["HighlyExperimental"].comments().clear();

diff --git a/xenon.nix b/xenon.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake pkg-config ninja ];
   buildInputs = [ sdl3 fmt toml11 ];
   postUnpack = ''
+    rm -rf $sourceRoot/third_party/ImGui
     cp -r ${imgui} $sourceRoot/third_party/ImGui
     chmod -R +w $sourceRoot
   '';