From eb6409aee5131c7f72841b3e33665749b69a76da Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Sun, 11 Sep 2022 20:19:04 +0200 Subject: [PATCH] Move binding libraries to ffi directory --- Cargo.toml | 6 +++--- {renderdoc-sys => ffi/renderdoc-sys}/Cargo.toml | 0 {renderdoc-sys => ffi/renderdoc-sys}/src/helpers.rs | 0 {renderdoc-sys => ffi/renderdoc-sys}/src/lib.rs | 0 {sdl2-sys => ffi/sdl2-sys}/Cargo.toml | 0 {sdl2-sys => ffi/sdl2-sys}/build.rs | 0 {sdl2-sys => ffi/sdl2-sys}/src/lib.rs | 0 {vulkan-sys => ffi/vulkan-sys}/.gitignore | 0 {vulkan-sys => ffi/vulkan-sys}/Cargo.toml | 0 .../vulkan-sys}/examples/triangle.frag.glsl | 0 .../vulkan-sys}/examples/triangle.frag.spv | Bin {vulkan-sys => ffi/vulkan-sys}/examples/triangle.rs | 0 .../vulkan-sys}/examples/triangle.vert.glsl | 0 .../vulkan-sys}/examples/triangle.vert.spv | Bin {vulkan-sys => ffi/vulkan-sys}/src/enums.rs | 0 {vulkan-sys => ffi/vulkan-sys}/src/flags.rs | 0 {vulkan-sys => ffi/vulkan-sys}/src/functions.rs | 0 {vulkan-sys => ffi/vulkan-sys}/src/handles.rs | 0 {vulkan-sys => ffi/vulkan-sys}/src/helpers.rs | 0 {vulkan-sys => ffi/vulkan-sys}/src/lib.rs | 0 {vulkan-sys => ffi/vulkan-sys}/src/structs.rs | 0 narcissus-app/Cargo.toml | 2 +- narcissus-gpu/Cargo.toml | 2 +- 23 files changed, 5 insertions(+), 5 deletions(-) rename {renderdoc-sys => ffi/renderdoc-sys}/Cargo.toml (100%) rename {renderdoc-sys => ffi/renderdoc-sys}/src/helpers.rs (100%) rename {renderdoc-sys => ffi/renderdoc-sys}/src/lib.rs (100%) rename {sdl2-sys => ffi/sdl2-sys}/Cargo.toml (100%) rename {sdl2-sys => ffi/sdl2-sys}/build.rs (100%) rename {sdl2-sys => ffi/sdl2-sys}/src/lib.rs (100%) rename {vulkan-sys => ffi/vulkan-sys}/.gitignore (100%) rename {vulkan-sys => ffi/vulkan-sys}/Cargo.toml (100%) rename {vulkan-sys => ffi/vulkan-sys}/examples/triangle.frag.glsl (100%) rename {vulkan-sys => ffi/vulkan-sys}/examples/triangle.frag.spv (100%) rename {vulkan-sys => ffi/vulkan-sys}/examples/triangle.rs (100%) rename {vulkan-sys => ffi/vulkan-sys}/examples/triangle.vert.glsl (100%) rename {vulkan-sys => ffi/vulkan-sys}/examples/triangle.vert.spv (100%) rename {vulkan-sys => ffi/vulkan-sys}/src/enums.rs (100%) rename {vulkan-sys => ffi/vulkan-sys}/src/flags.rs (100%) rename {vulkan-sys => ffi/vulkan-sys}/src/functions.rs (100%) rename {vulkan-sys => ffi/vulkan-sys}/src/handles.rs (100%) rename {vulkan-sys => ffi/vulkan-sys}/src/helpers.rs (100%) rename {vulkan-sys => ffi/vulkan-sys}/src/lib.rs (100%) rename {vulkan-sys => ffi/vulkan-sys}/src/structs.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 296a65a..358aadc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,9 +1,9 @@ [workspace] members = [ - "vulkan-sys", - "sdl2-sys", - "renderdoc-sys", + "ffi/vulkan-sys", + "ffi/sdl2-sys", + "ffi/renderdoc-sys", "narcissus", "narcissus-core", "narcissus-gpu", diff --git a/renderdoc-sys/Cargo.toml b/ffi/renderdoc-sys/Cargo.toml similarity index 100% rename from renderdoc-sys/Cargo.toml rename to ffi/renderdoc-sys/Cargo.toml diff --git a/renderdoc-sys/src/helpers.rs b/ffi/renderdoc-sys/src/helpers.rs similarity index 100% rename from renderdoc-sys/src/helpers.rs rename to ffi/renderdoc-sys/src/helpers.rs diff --git a/renderdoc-sys/src/lib.rs b/ffi/renderdoc-sys/src/lib.rs similarity index 100% rename from renderdoc-sys/src/lib.rs rename to ffi/renderdoc-sys/src/lib.rs diff --git a/sdl2-sys/Cargo.toml b/ffi/sdl2-sys/Cargo.toml similarity index 100% rename from sdl2-sys/Cargo.toml rename to ffi/sdl2-sys/Cargo.toml diff --git a/sdl2-sys/build.rs b/ffi/sdl2-sys/build.rs similarity index 100% rename from sdl2-sys/build.rs rename to ffi/sdl2-sys/build.rs diff --git a/sdl2-sys/src/lib.rs b/ffi/sdl2-sys/src/lib.rs similarity index 100% rename from sdl2-sys/src/lib.rs rename to ffi/sdl2-sys/src/lib.rs diff --git a/vulkan-sys/.gitignore b/ffi/vulkan-sys/.gitignore similarity index 100% rename from vulkan-sys/.gitignore rename to ffi/vulkan-sys/.gitignore diff --git a/vulkan-sys/Cargo.toml b/ffi/vulkan-sys/Cargo.toml similarity index 100% rename from vulkan-sys/Cargo.toml rename to ffi/vulkan-sys/Cargo.toml diff --git a/vulkan-sys/examples/triangle.frag.glsl b/ffi/vulkan-sys/examples/triangle.frag.glsl similarity index 100% rename from vulkan-sys/examples/triangle.frag.glsl rename to ffi/vulkan-sys/examples/triangle.frag.glsl diff --git a/vulkan-sys/examples/triangle.frag.spv b/ffi/vulkan-sys/examples/triangle.frag.spv similarity index 100% rename from vulkan-sys/examples/triangle.frag.spv rename to ffi/vulkan-sys/examples/triangle.frag.spv diff --git a/vulkan-sys/examples/triangle.rs b/ffi/vulkan-sys/examples/triangle.rs similarity index 100% rename from vulkan-sys/examples/triangle.rs rename to ffi/vulkan-sys/examples/triangle.rs diff --git a/vulkan-sys/examples/triangle.vert.glsl b/ffi/vulkan-sys/examples/triangle.vert.glsl similarity index 100% rename from vulkan-sys/examples/triangle.vert.glsl rename to ffi/vulkan-sys/examples/triangle.vert.glsl diff --git a/vulkan-sys/examples/triangle.vert.spv b/ffi/vulkan-sys/examples/triangle.vert.spv similarity index 100% rename from vulkan-sys/examples/triangle.vert.spv rename to ffi/vulkan-sys/examples/triangle.vert.spv diff --git a/vulkan-sys/src/enums.rs b/ffi/vulkan-sys/src/enums.rs similarity index 100% rename from vulkan-sys/src/enums.rs rename to ffi/vulkan-sys/src/enums.rs diff --git a/vulkan-sys/src/flags.rs b/ffi/vulkan-sys/src/flags.rs similarity index 100% rename from vulkan-sys/src/flags.rs rename to ffi/vulkan-sys/src/flags.rs diff --git a/vulkan-sys/src/functions.rs b/ffi/vulkan-sys/src/functions.rs similarity index 100% rename from vulkan-sys/src/functions.rs rename to ffi/vulkan-sys/src/functions.rs diff --git a/vulkan-sys/src/handles.rs b/ffi/vulkan-sys/src/handles.rs similarity index 100% rename from vulkan-sys/src/handles.rs rename to ffi/vulkan-sys/src/handles.rs diff --git a/vulkan-sys/src/helpers.rs b/ffi/vulkan-sys/src/helpers.rs similarity index 100% rename from vulkan-sys/src/helpers.rs rename to ffi/vulkan-sys/src/helpers.rs diff --git a/vulkan-sys/src/lib.rs b/ffi/vulkan-sys/src/lib.rs similarity index 100% rename from vulkan-sys/src/lib.rs rename to ffi/vulkan-sys/src/lib.rs diff --git a/vulkan-sys/src/structs.rs b/ffi/vulkan-sys/src/structs.rs similarity index 100% rename from vulkan-sys/src/structs.rs rename to ffi/vulkan-sys/src/structs.rs diff --git a/narcissus-app/Cargo.toml b/narcissus-app/Cargo.toml index 977182d..7318664 100644 --- a/narcissus-app/Cargo.toml +++ b/narcissus-app/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [dependencies] narcissus-core = { path = "../narcissus-core" } -sdl2-sys = { path = "../sdl2-sys" } \ No newline at end of file +sdl2-sys = { path = "../ffi/sdl2-sys" } \ No newline at end of file diff --git a/narcissus-gpu/Cargo.toml b/narcissus-gpu/Cargo.toml index 41a0c97..a51e444 100644 --- a/narcissus-gpu/Cargo.toml +++ b/narcissus-gpu/Cargo.toml @@ -9,4 +9,4 @@ edition = "2021" libc = "0.2" narcissus-core = { path = "../narcissus-core" } narcissus-app = { path = "../narcissus-app" } -vulkan-sys = { path = "../vulkan-sys" } \ No newline at end of file +vulkan-sys = { path = "../ffi/vulkan-sys" } \ No newline at end of file -- 2.49.0