c++: Moved to new lib dep structure

.nix/derivation.nix

@@ -23,7 +23,9 @@ stdenvNoCC.mkDerivation {
   ];
 
   buildInputs = [
-    forstio
+    forstio.core
+    forstio.async
+    forstio.io
     xorg.libxcb
     xorg.libX11
     libGL

SConstruct

@@ -42,11 +42,11 @@ env_vars.Add('prefix',
 	validator=isAbsolutePath
 )
 
-env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=['#source','#','#driver'],
+env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=['#source','#driver'],
     CXX='clang++',
     CPPDEFINES=['SAW_UNIX_XCB'],
     CXXFLAGS=['-std=c++20','-g','-Wall','-Wextra'],
-    LIBS=['forstio','xcb','X11','X11-xcb'])
+    LIBS=['forstio-core','forstio-async','forstio-io','xcb','X11','X11-xcb'])
 env.__class__.add_source_files = add_kel_source_files
 env.Tool('compilation_db');
 env.cdb = env.CompilationDatabase('compile_commands.json');

default.nix

@@ -1,18 +1,24 @@
-{ pkgs ? import <nixpkgs> {
-  overlays = [
-    (import ((builtins.fetchGit {
-      url = "gitea@git.keldu.de:nixos/kelducfg.git";
-      ref = "master";
-    }).outPath + "/overlays/default.nix"))
-  ];
-}
+{ pkgs ? import <nixpkgs> {}
 }:
 
 let
-  forstio = import ((builtins.fetchGit {
-    url = "gitea@git.keldu.de:forstio/forstio.git";
-    ref = "dev";
-  }).outPath + "/default.nix") {};
+  forstio = { 
+    core =
+      import ((builtins.fetchGit {
+        url = "gitea@git.keldu.de:forstio/forstio-core.git";
+        ref = "master";
+      }).outPath + "/default.nix") {};
+    async =
+      import ((builtins.fetchGit {
+        url = "gitea@git.keldu.de:forstio/forstio-async.git";
+        ref = "master";
+      }).outPath + "/default.nix") {};
+    io =
+      import ((builtins.fetchGit {
+        url = "gitea@git.keldu.de:forstio/forstio-io.git";
+        ref = "master";
+      }).outPath + "/default.nix") {};
+  };
 in
 pkgs.callPackage ./.nix/derivation.nix {
   inherit forstio;

driver/device_xcb.h

@@ -2,7 +2,7 @@
 
 #include <X11/Xlib-xcb.h>
 #include <X11/Xlib.h>
-#include <forstio/io.h>
+#include <forstio/io/io.h>
 #include <xcb/xcb.h>
 
 #include <map>

source/forstio/window/device.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <forstio/async.h>
+#include <forstio/async/async.h>
 #include <forstio/common.h>
 
 #include <string_view>

source/forstio/window/gl/gl_window.h

@@ -3,7 +3,7 @@
 #include "../video_mode.h"
 #include "../window.h"
 
-#include <forstio/async.h>
+#include <forstio/async/async.h>
 
 #include <string_view>
 

source/forstio/window/window.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <forstio/async.h>
+#include <forstio/async/async.h>
 #include <forstio/common.h>
 
 #include <string_view>