diff options
| author | Claudius "keldu" Holeksa <mail@keldu.de> | 2024-03-07 10:28:04 +0100 |
|---|---|---|
| committer | Claudius "keldu" Holeksa <mail@keldu.de> | 2024-03-07 10:28:04 +0100 |
| commit | 7a097bd3bdb288342cc7314f6942347274811030 (patch) | |
| tree | 4655ba3f79e79b74ae83ad724d66a56a5e319a1b | |
| parent | d2520819150d9a794baf7505d7d02dadeacd5266 (diff) | |
io: Move to new dir structure
| -rw-r--r-- | default.nix | 10 | ||||
| -rw-r--r-- | modules/io/SConstruct | 2 | ||||
| -rw-r--r-- | modules/io/c++/SConscript (renamed from modules/io/SConscript) | 0 | ||||
| -rw-r--r-- | modules/io/c++/io.cpp (renamed from modules/io/io.cpp) | 0 | ||||
| -rw-r--r-- | modules/io/c++/io.hpp (renamed from modules/io/io.hpp) | 0 | ||||
| -rw-r--r-- | modules/io/c++/io_helpers.cpp (renamed from modules/io/io_helpers.cpp) | 0 | ||||
| -rw-r--r-- | modules/io/c++/io_helpers.hpp (renamed from modules/io/io_helpers.hpp) | 0 | ||||
| -rw-r--r-- | modules/io/c++/io_unix.cpp (renamed from modules/io/io_unix.cpp) | 0 |
8 files changed, 3 insertions, 9 deletions
diff --git a/default.nix b/default.nix index ef339d8..ac0665c 100644 --- a/default.nix +++ b/default.nix @@ -54,20 +54,14 @@ in rec { inherit stdenv; inherit clang-tools; }; - - window = pkgs.callPackage modules/window/.nix/derivation.nix { + + io_codec = pkgs.callPackage modules/io_codec/.nix/derivation.nix { inherit version; inherit forstio; inherit stdenv; inherit clang-tools; }; - window-opengl = pkgs.callPackage modules/window-opengl/.nix/derivation.nix { - inherit version; - inherit forstio; - inherit stdenv; - inherit clang-tools; - }; tools = pkgs.callPackage modules/tools/.nix/derivation.nix { inherit version; inherit forstio; diff --git a/modules/io/SConstruct b/modules/io/SConstruct index 4cccf82..5b03a9f 100644 --- a/modules/io/SConstruct +++ b/modules/io/SConstruct @@ -57,7 +57,7 @@ env.headers = []; env.targets = []; Export('env') -SConscript('SConscript') +SConscript('c++/SConscript') env.Alias('cdb', env.cdb); env.Alias('all', [env.targets]); diff --git a/modules/io/SConscript b/modules/io/c++/SConscript index cb10119..cb10119 100644 --- a/modules/io/SConscript +++ b/modules/io/c++/SConscript diff --git a/modules/io/io.cpp b/modules/io/c++/io.cpp index 06c9cbb..06c9cbb 100644 --- a/modules/io/io.cpp +++ b/modules/io/c++/io.cpp diff --git a/modules/io/io.hpp b/modules/io/c++/io.hpp index ea185a8..ea185a8 100644 --- a/modules/io/io.hpp +++ b/modules/io/c++/io.hpp diff --git a/modules/io/io_helpers.cpp b/modules/io/c++/io_helpers.cpp index 975dbcb..975dbcb 100644 --- a/modules/io/io_helpers.cpp +++ b/modules/io/c++/io_helpers.cpp diff --git a/modules/io/io_helpers.hpp b/modules/io/c++/io_helpers.hpp index 4f45382..4f45382 100644 --- a/modules/io/io_helpers.hpp +++ b/modules/io/c++/io_helpers.hpp diff --git a/modules/io/io_unix.cpp b/modules/io/c++/io_unix.cpp index 8afdae9..8afdae9 100644 --- a/modules/io/io_unix.cpp +++ b/modules/io/c++/io_unix.cpp |