Rsconscript

@@ -6,15 +6,17 @@ configure do
   check_program "convert"
 end
 
-main_env = env do |env|
+build do
+  main_env = Rscons::Environment.new do |env|
     env["sources"] = glob("src/**/*.{c,d}", "libs/Derelict*/**/*.d")
     env["CCFLAGS"] += %w[-Wall]
-  env["D_IMPORT_PATH"] += glob("src", "libs/Derelict*/source")
+    env["D_IMPORT_PATH"] += glob("src/**", "libs/Derelict*/source")
     env["DFLAGS"] += %w[-Wall]
     env["LIBS"] += %w[X11 GLX]
     env.Program("jes", "${sources}")
-end
+  end
-main_env.clone do |env|
+  main_env.clone do |env|
     env["DFLAGS"] += %w[-g -funittest]
     env.Program("jestest", "${sources}")
+  end
 end

src/gltk/program.d

@@ -155,9 +155,9 @@ class Program(uniforms...)
     {
         static if ((i % 2) == 0)
         {
-            mixin("void set_" ~ v ~ "(" ~ uniform_param_decl_list(uniforms[i + 1]) ~ ")" ~
+            mixin("void set_" ~ v ~ "(" ~ uniform_param_decl_list(uniforms[i + 1]) ~ ")"
-                  "{" ~
+                  "{"
-                  "    glUniform" ~ uniforms[i + 1] ~ "(m_uniform_" ~ v ~ ", " ~ uniform_param_list(uniforms[i + 1]) ~ ");" ~
+                  "    glUniform" ~ uniforms[i + 1] ~ "(m_uniform_" ~ v ~ ", " ~ uniform_param_list(uniforms[i + 1]) ~ ");"
                   "}");
         }
     }

src/jes/gui/package.d

@@ -8,7 +8,7 @@ class Gui
 {
     this()
     {
-        if (!jtk.initialize())
+        if (!jtk.init())
         {
             throw new Exception("JTK initialization failed.");
         }

src/jtk/init.d

@@ -9,7 +9,7 @@ import derelict.opengl;
 private extern(C) bool jtk_init();
 private extern(C) void jtk_quit();
 
-bool initialize()
+bool init()
 {
     DerelictGL3.load();
 

src/jtk/window.d

@@ -2,7 +2,6 @@ module jtk.window;
 
 import std.string;
 import core.sync.mutex;
-import core.exception;
 
 import derelict.opengl;
 
@@ -72,7 +71,7 @@ class Window
         {
             return windows_by_id[window_id];
         }
-        catch (RangeError re)
+        catch (core.exception.RangeError re)
         {
             throw new Exception("Could not find requested JTK window ID");
         }