Update rscons

Rsconscript

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

rscons

@@ -1,6 +1,31 @@
 #!/usr/bin/env ruby
-script = File.join(File.dirname(__FILE__), ".rscons-2.1.0-967afecbb5d879b13cd42f3785ed037b.rb")
+
-unless File.exists?(script)
+# Copyright (c) 2013-2022 Josh Holtrop
+#
+# MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+script = File.join(File.dirname(__FILE__), ".rscons-3.2.0-9c72a96ad688d44c0d39ece9d99800e7.rb")
+unless File.exist?(script)
   if File.read(__FILE__, mode: "rb") =~ /^#==>(.*)/
     require "zlib"
     require "base64"
@@ -16,6 +41,6 @@ unless File.exists?(script)
 end
 load script
 if __FILE__ == $0
-  Rscons::Cli.run(ARGV)
+  Rscons::Cli.new.run(ARGV)
 end
-#==>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 truncated
+#==>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 truncated

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.init())
+        if (!jtk.initialize())
         {
             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 init()
+bool initialize()
 {
     DerelictGL3.load();
 

src/jtk/window.d

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