window: Moving around directories

9 files changed, 11 insertions, 5 deletions

diff --git a/modules/window/.nix/derivation.nix b/modules/window/.nix/derivation.nix
index 67a682c..2b15505 100644
--- a/modules/window/.nix/derivation.nix
+++ b/modules/window/.nix/derivation.nix
@@ -28,7 +28,13 @@ in stdenv.mkDerivation {
     forstio.codec
     xorg.libX11
     xorg.libxcb
-  ];
+ ];
+ 
+  doCheck = true;
+  checkPhase = ''
+    scons test
+    ./bin/tests
+  '';
 
   outputs = ["out" "dev"];
 }
diff --git a/modules/window/SConscript b/modules/window/c++/SConscript
index bd830b9..10d88c6 100644
--- a/modules/window/SConscript
+++ b/modules/window/c++/SConscript
@@ -21,18 +21,18 @@ env.headers += window_env.headers;
 ## Shared lib
 objects_shared = []
 window_env.add_source_files(objects_shared, window_env.sources, shared=True);
-window_env.library_shared = window_env.SharedLibrary('#build/forstio-window', [objects_shared]);
+env.library_shared = window_env.SharedLibrary('#build/forstio-window', [objects_shared]);
 
 ## Static lib
 objects_static = []
 window_env.add_source_files(objects_static, window_env.sources, shared=False);
-window_env.library_static = window_env.StaticLibrary('#build/forstio-window', [objects_static]);
+env.library_static = window_env.StaticLibrary('#build/forstio-window', [objects_static]);
 
 # Set Alias
-env.Alias('library_window', [window_env.library_shared, window_env.library_static]);
+env.Alias('library_window', [env.library_shared, env.library_static]);
 
 env.targets += ['library_window'];
 
 # Install
-env.Install('$prefix/lib/', [window_env.library_shared, window_env.library_static]);
+env.Install('$prefix/lib/', [env.library_shared, env.library_static]);
 env.Install('$prefix/include/forstio/window/', [window_env.headers]);
diff --git a/modules/window/backends.h b/modules/window/c++/backends.h
index e129037..e129037 100644
--- a/modules/window/backends.h
+++ b/modules/window/c++/backends.h
diff --git a/modules/window/device.h b/modules/window/c++/device.h
index 6a28cd5..6a28cd5 100644
--- a/modules/window/device.h
+++ b/modules/window/c++/device.h
diff --git a/modules/window/linux_xcb.h b/modules/window/c++/linux_xcb.h
index 65ff94d..65ff94d 100644
--- a/modules/window/linux_xcb.h
+++ b/modules/window/c++/linux_xcb.h
diff --git a/modules/window/video_mode.h b/modules/window/c++/video_mode.h
index a8f1695..a8f1695 100644
--- a/modules/window/video_mode.h
+++ b/modules/window/c++/video_mode.h
diff --git a/modules/window/window.h b/modules/window/c++/window.h
index 0e8d051..0e8d051 100644
--- a/modules/window/window.h
+++ b/modules/window/c++/window.h
diff --git a/modules/window/xcb.cpp b/modules/window/c++/xcb.cpp
index 1b804ba..1b804ba 100644
--- a/modules/window/xcb.cpp
+++ b/modules/window/c++/xcb.cpp
diff --git a/modules/window/xcb.h b/modules/window/c++/xcb.h
index a2a9b0b..a2a9b0b 100644
--- a/modules/window/xcb.h
+++ b/modules/window/c++/xcb.h