58c91759f6c2 — Leonard Ritter 8 months ago
* fixes for recent changes to module environments in scopes
5 files changed, 13 insertions(+), 14 deletions(-)

M _project.sc => __env.sc
M lib/tukan/core.sc
M lib/tukan/sdl.sc
R lib/tukan/use.sc => 
M testing/testfragment.sc
M _project.sc => __env.sc +11 -1
@@ 1,4 1,14 @@ 
 if console?
     print "console launched"
-import .lib.tukan.use
 
+'bind-symbols __env
+    module-search-path =
+        cons
+            .. module-dir "/lib/?.sc"
+            .. module-dir "/lib/?/init.sc"
+            __env.module-search-path
+    include-search-path =
+        cons
+            .. module-dir "/cdefs"
+            .. module-dir "/include/glad"
+            __env.include-search-path

          
M lib/tukan/core.sc +1 -1
@@ 1,7 1,7 @@ 
 
 using import .globals
 
-project-library
+shared-library
     static-if (operating-system == 'windows) "tukan_core.dll"
     else "libtukan_core.so"
 

          
M lib/tukan/sdl.sc +1 -1
@@ 4,7 4,7 @@ using import .globals
 if (operating-system == 'windows)
     load-library "SDL2.dll"
 else
-    project-library "libSDL2-2.0.so.0"
+    shared-library "libSDL2-2.0.so.0"
 
 run-stage;
 

          
R lib/tukan/use.sc =>  +0 -10
@@ 1,10 0,0 @@ 
-'define-symbol package 'path
-    cons
-        .. module-dir "/../?.sc"
-        .. module-dir "/../?/init.sc"
-        package.path
-'define-symbol package 'include-path
-    cons
-        .. module-dir "/../../cdefs"
-        .. module-dir "/../../include/glad"
-        package.include-path

          
M testing/testfragment.sc +0 -1
@@ 4,7 4,6 @@ using import glsl
 using import struct
 using import Capture
 
-import ..lib.tukan.use
 using import tukan.GLMain
 using import tukan.Screen
 using import tukan.GUI