From b4a343e9dbfb8f290fe420671bc36cb0597decad Mon Sep 17 00:00:00 2001 From: modeco80 Date: Sun, 16 Jul 2023 05:46:49 -0400 Subject: [PATCH] move all native projects to native/projects this should make the folder structure a bit more navigatable --- .clang-format | 2 +- .gitignore | 2 +- native/CMakeLists.txt | 8 ++++---- native/{ => projects}/gmsv_lcpu/CMakeLists.txt | 0 native/{ => projects}/gmsv_lcpu/NOTES.md | 0 native/{ => projects}/gmsv_lcpu/abi.ver | 0 native/{ => projects}/lucore/CMakeLists.txt | 0 native/{ => projects}/lucore/include/lucore/Assert.hpp | 0 .../{ => projects}/lucore/include/lucore/OptionalRef.hpp | 0 native/{ => projects}/lucore/src/Assert.cpp | 0 native/{ => projects}/riscv/CMakeLists.txt | 0 native/{ => projects}/riscv/README.md | 0 native/{ => projects}/riscv/include/riscv/Bus.hpp | 0 native/{ => projects}/riscv/include/riscv/CPU.hpp | 0 native/{ => projects}/riscv/include/riscv/Types.hpp | 0 native/{ => projects}/riscv/src/Bus.cpp | 0 native/{ => projects}/riscv/src/MemoryDevice.cpp | 0 17 files changed, 6 insertions(+), 6 deletions(-) rename native/{ => projects}/gmsv_lcpu/CMakeLists.txt (100%) rename native/{ => projects}/gmsv_lcpu/NOTES.md (100%) rename native/{ => projects}/gmsv_lcpu/abi.ver (100%) rename native/{ => projects}/lucore/CMakeLists.txt (100%) rename native/{ => projects}/lucore/include/lucore/Assert.hpp (100%) rename native/{ => projects}/lucore/include/lucore/OptionalRef.hpp (100%) rename native/{ => projects}/lucore/src/Assert.cpp (100%) rename native/{ => projects}/riscv/CMakeLists.txt (100%) rename native/{ => projects}/riscv/README.md (100%) rename native/{ => projects}/riscv/include/riscv/Bus.hpp (100%) rename native/{ => projects}/riscv/include/riscv/CPU.hpp (100%) rename native/{ => projects}/riscv/include/riscv/Types.hpp (100%) rename native/{ => projects}/riscv/src/Bus.cpp (100%) rename native/{ => projects}/riscv/src/MemoryDevice.cpp (100%) diff --git a/.clang-format b/.clang-format index 011a13d..3927a2f 100755 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,4 @@ -# Clang-Format file +# .clang-format for native code portion BasedOnStyle: Google diff --git a/.gitignore b/.gitignore index fb8fec7..18168a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ build/ lua/bin -native/riscv/ref +native/projects/riscv/ref .cache/ .vscode/ diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index 52dff80..cc7de41 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -3,10 +3,10 @@ project(lcpu-native DESCRIPTION "Superproject for LCPU GMOD Native Module" ) -add_subdirectory(lucore) +add_subdirectory(projects/lucore) # RISC-V emulation library -add_subdirectory(riscv) +add_subdirectory(projects/riscv) -# Server-side emulation/assembler library -#add_subdirectory(gmsv_lcpu) +# Garry's Mod bindings +#add_subdirectory(projects/gmsv_lcpu) diff --git a/native/gmsv_lcpu/CMakeLists.txt b/native/projects/gmsv_lcpu/CMakeLists.txt similarity index 100% rename from native/gmsv_lcpu/CMakeLists.txt rename to native/projects/gmsv_lcpu/CMakeLists.txt diff --git a/native/gmsv_lcpu/NOTES.md b/native/projects/gmsv_lcpu/NOTES.md similarity index 100% rename from native/gmsv_lcpu/NOTES.md rename to native/projects/gmsv_lcpu/NOTES.md diff --git a/native/gmsv_lcpu/abi.ver b/native/projects/gmsv_lcpu/abi.ver similarity index 100% rename from native/gmsv_lcpu/abi.ver rename to native/projects/gmsv_lcpu/abi.ver diff --git a/native/lucore/CMakeLists.txt b/native/projects/lucore/CMakeLists.txt similarity index 100% rename from native/lucore/CMakeLists.txt rename to native/projects/lucore/CMakeLists.txt diff --git a/native/lucore/include/lucore/Assert.hpp b/native/projects/lucore/include/lucore/Assert.hpp similarity index 100% rename from native/lucore/include/lucore/Assert.hpp rename to native/projects/lucore/include/lucore/Assert.hpp diff --git a/native/lucore/include/lucore/OptionalRef.hpp b/native/projects/lucore/include/lucore/OptionalRef.hpp similarity index 100% rename from native/lucore/include/lucore/OptionalRef.hpp rename to native/projects/lucore/include/lucore/OptionalRef.hpp diff --git a/native/lucore/src/Assert.cpp b/native/projects/lucore/src/Assert.cpp similarity index 100% rename from native/lucore/src/Assert.cpp rename to native/projects/lucore/src/Assert.cpp diff --git a/native/riscv/CMakeLists.txt b/native/projects/riscv/CMakeLists.txt similarity index 100% rename from native/riscv/CMakeLists.txt rename to native/projects/riscv/CMakeLists.txt diff --git a/native/riscv/README.md b/native/projects/riscv/README.md similarity index 100% rename from native/riscv/README.md rename to native/projects/riscv/README.md diff --git a/native/riscv/include/riscv/Bus.hpp b/native/projects/riscv/include/riscv/Bus.hpp similarity index 100% rename from native/riscv/include/riscv/Bus.hpp rename to native/projects/riscv/include/riscv/Bus.hpp diff --git a/native/riscv/include/riscv/CPU.hpp b/native/projects/riscv/include/riscv/CPU.hpp similarity index 100% rename from native/riscv/include/riscv/CPU.hpp rename to native/projects/riscv/include/riscv/CPU.hpp diff --git a/native/riscv/include/riscv/Types.hpp b/native/projects/riscv/include/riscv/Types.hpp similarity index 100% rename from native/riscv/include/riscv/Types.hpp rename to native/projects/riscv/include/riscv/Types.hpp diff --git a/native/riscv/src/Bus.cpp b/native/projects/riscv/src/Bus.cpp similarity index 100% rename from native/riscv/src/Bus.cpp rename to native/projects/riscv/src/Bus.cpp diff --git a/native/riscv/src/MemoryDevice.cpp b/native/projects/riscv/src/MemoryDevice.cpp similarity index 100% rename from native/riscv/src/MemoryDevice.cpp rename to native/projects/riscv/src/MemoryDevice.cpp