2d0b10ccc0b6 — Leonard Ritter a month ago
* cleaned up directory structure
193 files changed, 47 insertions(+), 39 deletions(-)

M .hgignore
M launch-tukan => bin/tukan
M externals/build_common.py
M genie.lua
M tukan/DockGUI.sc => lib/tukan/DockGUI.sc
M tukan/File.sc => lib/tukan/File.sc
M tukan/GBuffer.sc => lib/tukan/GBuffer.sc
M tukan/GLMain.sc => lib/tukan/GLMain.sc
M tukan/GUI.sc => lib/tukan/GUI.sc
M tukan/Pool.sc => lib/tukan/Pool.sc
M tukan/SHA1.sc => lib/tukan/SHA1.sc
M tukan/SHA256.sc => lib/tukan/SHA256.sc
M tukan/Screen.sc => lib/tukan/Screen.sc
M tukan/SpritePainter.sc => lib/tukan/SpritePainter.sc
M tukan/VertexPainter.sc => lib/tukan/VertexPainter.sc
M tukan/audio.sc => lib/tukan/audio.sc
M tukan/bitmap.sc => lib/tukan/bitmap.sc
M tukan/bitmath.sc => lib/tukan/bitmath.sc
M tukan/blur.sc => lib/tukan/blur.sc
M tukan/brdf.sc => lib/tukan/brdf.sc
M tukan/bullet/C.sc => lib/tukan/bullet/C.sc
M tukan/chipmunk/C.sc => lib/tukan/chipmunk/C.sc
M tukan/chipmunk/init.sc => lib/tukan/chipmunk/init.sc
M tukan/color.sc => lib/tukan/color.sc
M tukan/console.sc => lib/tukan/console.sc
M tukan/core.sc => lib/tukan/core.sc
M tukan/crypto.sc => lib/tukan/crypto.sc
M tukan/csg.sc => lib/tukan/csg.sc
M tukan/csgpainter.sc => lib/tukan/csgpainter.sc
M tukan/db.sc => lib/tukan/db.sc
M tukan/derivative.sc => lib/tukan/derivative.sc
M tukan/dsp/delay.sc => lib/tukan/dsp/delay.sc
M tukan/dsp/svf.sc => lib/tukan/dsp/svf.sc
M tukan/dsp/utils.sc => lib/tukan/dsp/utils.sc
M tukan/fog.sc => lib/tukan/fog.sc
M tukan/gamecontrollerdb.sc => lib/tukan/gamecontrollerdb.sc
M tukan/gl.sc => lib/tukan/gl.sc
A => lib/tukan/globals.sc
M tukan/gpucall.sc => lib/tukan/gpucall.sc
M tukan/hash.sc => lib/tukan/hash.sc
M tukan/hashmap.sc => lib/tukan/hashmap.sc
M tukan/icons/font_awesome.sc => lib/tukan/icons/font_awesome.sc
M tukan/icons/init.sc => lib/tukan/icons/init.sc
M tukan/icons/kenney.sc => lib/tukan/icons/kenney.sc
M tukan/icons/material_design.sc => lib/tukan/icons/material_design.sc
M tukan/imgui/cimgui.sc => lib/tukan/imgui/cimgui.sc
M tukan/imgui/init.sc => lib/tukan/imgui/init.sc
M tukan/input.sc => lib/tukan/input.sc
M tukan/interval.sc => lib/tukan/interval.sc
M tukan/isosurface.sc => lib/tukan/isosurface.sc
M tukan/libc.sc => lib/tukan/libc.sc
M tukan/lmdb.sc => lib/tukan/lmdb.sc
M tukan/main.sc => lib/tukan/main.sc
M tukan/math.sc => lib/tukan/math.sc
M tukan/mesh.sc => lib/tukan/mesh.sc
M tukan/midi.sc => lib/tukan/midi.sc
M tukan/module.sc => lib/tukan/module.sc
M tukan/nanovg/C.sc => lib/tukan/nanovg/C.sc
M tukan/nanovg/init.sc => lib/tukan/nanovg/init.sc
M tukan/nfd.sc => lib/tukan/nfd.sc
M tukan/noise.sc => lib/tukan/noise.sc
M tukan/normal.sc => lib/tukan/normal.sc
M tukan/ode/C.sc => lib/tukan/ode/C.sc
M tukan/ode/init.sc => lib/tukan/ode/init.sc
M tukan/oui.sc => lib/tukan/oui.sc
M tukan/packing.sc => lib/tukan/packing.sc
M tukan/pcg.sc => lib/tukan/pcg.sc
M tukan/perfect_hash.sc => lib/tukan/perfect_hash.sc
M tukan/portmidi.sc => lib/tukan/portmidi.sc
M tukan/projection.sc => lib/tukan/projection.sc
M tukan/random.sc => lib/tukan/random.sc
M tukan/raytrace.sc => lib/tukan/raytrace.sc
M tukan/rotation.sc => lib/tukan/rotation.sc
M tukan/sdf.sc => lib/tukan/sdf.sc
M tukan/sdl.sc => lib/tukan/sdl.sc
M tukan/ssao.sc => lib/tukan/ssao.sc
M tukan/stage.sc => lib/tukan/stage.sc
M tukan/thread.sc => lib/tukan/thread.sc
M tukan/timing.sc => lib/tukan/timing.sc
M tukan/use.sc => lib/tukan/use.sc
M tukan/view/blocktree.sc => lib/tukan/view/blocktree.sc
M tukan/view/events.sc => lib/tukan/view/events.sc
M tukan/view/hexedit.sc => lib/tukan/view/hexedit.sc
M tukan/view/old-code.sc => lib/tukan/view/old-code.sc
M tukan/view/shader.sc => lib/tukan/view/shader.sc
M tukan/voxel.sc => lib/tukan/voxel.sc
M tukan/vulkan.sc => lib/tukan/vulkan.sc
M assets/core/fonts/DejaVuSans.ttf => share/tukan/fonts/DejaVuSans.ttf
M assets/core/fonts/MaterialIcons-Regular.ttf => share/tukan/fonts/MaterialIcons-Regular.ttf
M assets/core/fonts/UbuntuMono-R.ttf => share/tukan/fonts/UbuntuMono-R.ttf
M assets/core/fonts/bmonofont-i18n.ttf => share/tukan/fonts/bmonofont-i18n.ttf
M assets/core/fonts/droidsans.ttf => share/tukan/fonts/droidsans.ttf
M assets/core/fonts/fontawesome-webfont.ttf => share/tukan/fonts/fontawesome-webfont.ttf
M assets/core/fonts/kenney-icon-font.ttf => share/tukan/fonts/kenney-icon-font.ttf
M assets/core/fonts/raleway_thin.ttf => share/tukan/fonts/raleway_thin.ttf
M assets/core/shaders/flat/simple.glsl => share/tukan/shaders/flat/simple.glsl
M assets/core/shaders/font/font.glsl => share/tukan/shaders/font/font.glsl
M assets/core/shaders/font/font_gshader.fs => share/tukan/shaders/font/font_gshader.fs
M assets/core/shaders/font/font_gshader.vs => share/tukan/shaders/font/font_gshader.vs
M assets/core/shaders/font/simple.glsl => share/tukan/shaders/font/simple.glsl
M assets/core/shaders/g/gbuffer_attr.glsl => share/tukan/shaders/g/gbuffer_attr.glsl
M assets/core/shaders/g/gshader.glsl => share/tukan/shaders/g/gshader.glsl
M assets/core/shaders/g/gshader_frag.glsl => share/tukan/shaders/g/gshader_frag.glsl
M assets/core/shaders/g/gshader_sdf.glsl => share/tukan/shaders/g/gshader_sdf.glsl
M assets/core/shaders/g/gshader_vars.glsl => share/tukan/shaders/g/gshader_vars.glsl
M assets/core/shaders/g/gshader_vert.glsl => share/tukan/shaders/g/gshader_vert.glsl
M assets/core/shaders/g/lpv/propagate.glsl => share/tukan/shaders/g/lpv/propagate.glsl
M assets/core/shaders/g/ppfx/dof-mblur.glsl => share/tukan/shaders/g/ppfx/dof-mblur.glsl
M assets/core/shaders/g/ppfx/gshader.glsl => share/tukan/shaders/g/ppfx/gshader.glsl
M assets/core/shaders/g/ppfx/gshader_frag.glsl => share/tukan/shaders/g/ppfx/gshader_frag.glsl
M assets/core/shaders/g/ppfx/light_direct.glsl => share/tukan/shaders/g/ppfx/light_direct.glsl
M assets/core/shaders/g/ppfx/light_proj.glsl => share/tukan/shaders/g/ppfx/light_proj.glsl
M assets/core/shaders/g/ppfx/light_shgrid.glsl => share/tukan/shaders/g/ppfx/light_shgrid.glsl
M assets/core/shaders/g/ppfx/ssao.glsl => share/tukan/shaders/g/ppfx/ssao.glsl
M assets/core/shaders/g/ppfx/ssgi.glsl => share/tukan/shaders/g/ppfx/ssgi.glsl
M assets/core/shaders/g/ppfx/view_ray.glsl => share/tukan/shaders/g/ppfx/view_ray.glsl
M assets/core/shaders/g/skybox.glsl => share/tukan/shaders/g/skybox.glsl
M assets/core/shaders/lib/blur.glsl => share/tukan/shaders/lib/blur.glsl
M assets/core/shaders/lib/brdf.glsl => share/tukan/shaders/lib/brdf.glsl
M assets/core/shaders/lib/cc.glsl => share/tukan/shaders/lib/cc.glsl
M assets/core/shaders/lib/dither.glsl => share/tukan/shaders/lib/dither.glsl
M assets/core/shaders/lib/evsm.glsl => share/tukan/shaders/lib/evsm.glsl
M assets/core/shaders/lib/ext.glsl => share/tukan/shaders/lib/ext.glsl
M assets/core/shaders/lib/fcc.glsl => share/tukan/shaders/lib/fcc.glsl
M assets/core/shaders/lib/filmic.glsl => share/tukan/shaders/lib/filmic.glsl
M assets/core/shaders/lib/fog.glsl => share/tukan/shaders/lib/fog.glsl
M assets/core/shaders/lib/hammersley.glsl => share/tukan/shaders/lib/hammersley.glsl
M assets/core/shaders/lib/hslhsv.glsl => share/tukan/shaders/lib/hslhsv.glsl
M assets/core/shaders/lib/ibl_sample.glsl => share/tukan/shaders/lib/ibl_sample.glsl
M assets/core/shaders/lib/mapping.glsl => share/tukan/shaders/lib/mapping.glsl
M assets/core/shaders/lib/math.glsl => share/tukan/shaders/lib/math.glsl
M assets/core/shaders/lib/normal_codec.glsl => share/tukan/shaders/lib/normal_codec.glsl
M assets/core/shaders/lib/packing.glsl => share/tukan/shaders/lib/packing.glsl
M assets/core/shaders/lib/perturb.glsl => share/tukan/shaders/lib/perturb.glsl
M assets/core/shaders/lib/projection.glsl => share/tukan/shaders/lib/projection.glsl
M assets/core/shaders/lib/quaternion.glsl => share/tukan/shaders/lib/quaternion.glsl
M assets/core/shaders/lib/sdf_math.glsl => share/tukan/shaders/lib/sdf_math.glsl
M assets/core/shaders/lib/sh.glsl => share/tukan/shaders/lib/sh.glsl
M assets/core/shaders/lib/snoise3.glsl => share/tukan/shaders/lib/snoise3.glsl
M assets/core/shaders/lib/srgb.glsl => share/tukan/shaders/lib/srgb.glsl
M assets/core/shaders/lib/svd.glsl => share/tukan/shaders/lib/svd.glsl
M assets/core/shaders/lib/tetfacets.glsl => share/tukan/shaders/lib/tetfacets.glsl
M assets/core/shaders/lib/ycbcr.glsl => share/tukan/shaders/lib/ycbcr.glsl
M assets/core/shaders/lib/ycocg.glsl => share/tukan/shaders/lib/ycocg.glsl
M assets/core/shaders/nm/nm_frag.glsl => share/tukan/shaders/nm/nm_frag.glsl
M assets/core/shaders/nm/nm_vars.glsl => share/tukan/shaders/nm/nm_vars.glsl
M assets/core/shaders/nm/nm_vert.glsl => share/tukan/shaders/nm/nm_vert.glsl
M assets/core/shaders/pom/pom_frag.glsl => share/tukan/shaders/pom/pom_frag.glsl
M assets/core/shaders/pom/pom_vars.glsl => share/tukan/shaders/pom/pom_vars.glsl
M assets/core/shaders/pom/pom_vert.glsl => share/tukan/shaders/pom/pom_vert.glsl
M assets/core/shaders/ppfx/blit.glsl => share/tukan/shaders/ppfx/blit.glsl
M assets/core/shaders/ppfx/blit_layers.glsl => share/tukan/shaders/ppfx/blit_layers.glsl
M assets/core/shaders/ppfx/bloom_mixdown.glsl => share/tukan/shaders/ppfx/bloom_mixdown.glsl
M assets/core/shaders/ppfx/blur.glsl => share/tukan/shaders/ppfx/blur.glsl
M assets/core/shaders/ppfx/copy.glsl => share/tukan/shaders/ppfx/copy.glsl
M assets/core/shaders/ppfx/copy_luma_ds2.glsl => share/tukan/shaders/ppfx/copy_luma_ds2.glsl
M assets/core/shaders/ppfx/debug_color.glsl => share/tukan/shaders/ppfx/debug_color.glsl
M assets/core/shaders/ppfx/debug_layer_color.glsl => share/tukan/shaders/ppfx/debug_layer_color.glsl
M assets/core/shaders/ppfx/debug_layer_depth.glsl => share/tukan/shaders/ppfx/debug_layer_depth.glsl
M assets/core/shaders/ppfx/debug_material.glsl => share/tukan/shaders/ppfx/debug_material.glsl
M assets/core/shaders/ppfx/debug_normal.glsl => share/tukan/shaders/ppfx/debug_normal.glsl
M assets/core/shaders/ppfx/debug_velocity.glsl => share/tukan/shaders/ppfx/debug_velocity.glsl
M assets/core/shaders/ppfx/debug_ycocg.glsl => share/tukan/shaders/ppfx/debug_ycocg.glsl
M assets/core/shaders/ppfx/derivative_map.glsl => share/tukan/shaders/ppfx/derivative_map.glsl
M assets/core/shaders/ppfx/fxaa3_11.glsl => share/tukan/shaders/ppfx/fxaa3_11.glsl
M assets/core/shaders/ppfx/luma.glsl => share/tukan/shaders/ppfx/luma.glsl
M assets/core/shaders/ppfx/oculus_rift.glsl => share/tukan/shaders/ppfx/oculus_rift.glsl
M assets/core/shaders/ppfx/ppfx_debug_depth.fs => share/tukan/shaders/ppfx/ppfx_debug_depth.fs
M assets/core/shaders/ppfx/ppfx_hdr_clip.fs => share/tukan/shaders/ppfx/ppfx_hdr_clip.fs
M assets/core/shaders/ppfx/ppfx_max.fs => share/tukan/shaders/ppfx/ppfx_max.fs
M assets/core/shaders/ppfx/tonemap.glsl => share/tukan/shaders/ppfx/tonemap.glsl
M assets/core/shaders/profiler/simple.glsl => share/tukan/shaders/profiler/simple.glsl
M assets/core/shaders/sm/font_shadow.fs => share/tukan/shaders/sm/font_shadow.fs
M assets/core/shaders/sm/font_shadow.vs => share/tukan/shaders/sm/font_shadow.vs
M assets/core/shaders/sm/ppfx/blur_evsm.glsl => share/tukan/shaders/sm/ppfx/blur_evsm.glsl
M assets/core/shaders/sm/ppfx/convert_evsm.glsl => share/tukan/shaders/sm/ppfx/convert_evsm.glsl
M assets/core/shaders/sm/shadow.glsl => share/tukan/shaders/sm/shadow.glsl
M assets/core/shaders/sm/shadow_frag.glsl => share/tukan/shaders/sm/shadow_frag.glsl
M assets/core/shaders/std/attrib.glsl => share/tukan/shaders/std/attrib.glsl
M assets/core/shaders/std/compat.glsl => share/tukan/shaders/std/compat.glsl
M assets/core/shaders/std/std.glsl => share/tukan/shaders/std/std.glsl
M assets/core/shaders/std/ubo.glsl => share/tukan/shaders/std/ubo.glsl
M assets/core/shaders/std/varying.glsl => share/tukan/shaders/std/varying.glsl
M assets/core/shaders/std/vq.glsl => share/tukan/shaders/std/vq.glsl
M assets/core/shaders/ui2d/ninepatch2d.glsl => share/tukan/shaders/ui2d/ninepatch2d.glsl
M assets/core/shaders/ui2d/quad2d.glsl => share/tukan/shaders/ui2d/quad2d.glsl
M assets/core/shaders/ui2d/ui2d.glsl => share/tukan/shaders/ui2d/ui2d.glsl
M assets/core/textures/blank.png => share/tukan/textures/blank.png
M assets/core/textures/blender_icons16.png => share/tukan/textures/blender_icons16.png
M assets/core/textures/lut_default.png => share/tukan/textures/lut_default.png
M assets/core/textures/spot.png => share/tukan/textures/spot.png
M assets/core/textures/zero.png => share/tukan/textures/zero.png
R tukan-console => 
M .hgignore +2 -1
@@ 9,6 9,8 @@ syntax: glob
 *.orig
 *.soil
 *.so
+*.so.0
+*.so.2.89
 *.a
 *.la
 *.dot

          
@@ 28,7 30,6 @@ testing/*.png
 
 syntax: regexp
 
-^bin
 ^cdefs
 ^build
 ^externals/archives

          
M launch-tukan => bin/tukan +3 -1
@@ 1,4 1,6 @@ 
 #!/usr/bin/env scopes
 
-import .tukan.main
+import ..lib.tukan.use
+import tukan.main
 
+

          
M externals/build_common.py +1 -1
@@ 22,7 22,7 @@ THISDIR = os.path.abspath(os.path.dirnam
 ROOTDIR = os.path.abspath(os.path.join(THISDIR, '..'))
 BUILDDIR = os.path.abspath(os.path.join(ROOTDIR, 'build'))
 TMPDIR = os.path.abspath(os.path.join(BUILDDIR, 'tmp'))
-BINDIR = os.path.abspath(os.path.join(ROOTDIR, 'bin'))
+BINDIR = os.path.abspath(os.path.join(ROOTDIR, 'lib'))
 LUADIR = os.path.abspath(os.path.join(ROOTDIR, 'modules'))
 LIBDIR = os.path.abspath(os.path.join(BUILDDIR, 'lib'))
 INCLUDEDIR = os.path.abspath(os.path.join(BUILDDIR, 'include'))

          
M genie.lua +2 -2
@@ 87,11 87,11 @@ solution "Tukan"
             "build/src/imgui",
         }
         libdirs {
-            "bin",
+            "lib",
             "build/src/nanovg/build",
             "build/src/tess2/Build",
         }
-        targetdir("bin")
+        targetdir("lib")
         defines { "IMGUI_IMPL_OPENGL_LOADER_GLAD" }
 
         if HAS_OVRSDK then

          
M tukan/DockGUI.sc => lib/tukan/DockGUI.sc +0 -0

        
M tukan/File.sc => lib/tukan/File.sc +0 -0

        
M tukan/GBuffer.sc => lib/tukan/GBuffer.sc +0 -0

        
M tukan/GLMain.sc => lib/tukan/GLMain.sc +0 -0

        
M tukan/GUI.sc => lib/tukan/GUI.sc +4 -3
@@ 10,6 10,7 @@ import .sdl
 
 using import .gl
 using import .imgui
+using import .globals
 
 #sugar set-hexstyle (name r g b a)
     let name-anchor = ('anchor name)

          
@@ 33,7 34,7 @@ run-stage;
 
 fn _init (glmain)
     let assets =
-        .. module-dir "/../assets/core/fonts"
+        .. assets-dir "/fonts"
     let sansfont =
         .. assets "/droidsans.ttf"
     let fixedfont =

          
@@ 51,9 52,9 @@ fn _init (glmain)
         GetIO;
 
     io.ConfigFlags |=
-        |
+        do  #|
             ImGuiConfigFlags_NavEnableKeyboard
-            ImGuiConfigFlags_ViewportsEnable
+            #ImGuiConfigFlags_ViewportsEnable
     # ImGuiConfigFlags_NavEnableKeyboard
 
     # merge in icons from Font Awesome

          
M tukan/Pool.sc => lib/tukan/Pool.sc +0 -0

        
M tukan/SHA1.sc => lib/tukan/SHA1.sc +0 -0

        
M tukan/SHA256.sc => lib/tukan/SHA256.sc +0 -0

        
M tukan/Screen.sc => lib/tukan/Screen.sc +0 -0

        
M tukan/SpritePainter.sc => lib/tukan/SpritePainter.sc +0 -0

        
M tukan/VertexPainter.sc => lib/tukan/VertexPainter.sc +0 -0

        
M tukan/audio.sc => lib/tukan/audio.sc +0 -0

        
M tukan/bitmap.sc => lib/tukan/bitmap.sc +0 -0

        
M tukan/bitmath.sc => lib/tukan/bitmath.sc +0 -0

        
M tukan/blur.sc => lib/tukan/blur.sc +0 -0

        
M tukan/brdf.sc => lib/tukan/brdf.sc +0 -0

        
M tukan/bullet/C.sc => lib/tukan/bullet/C.sc +0 -0

        
M tukan/chipmunk/C.sc => lib/tukan/chipmunk/C.sc +0 -0

        
M tukan/chipmunk/init.sc => lib/tukan/chipmunk/init.sc +0 -0

        
M tukan/color.sc => lib/tukan/color.sc +0 -0

        
M tukan/console.sc => lib/tukan/console.sc +0 -0

        
M tukan/core.sc => lib/tukan/core.sc +4 -2
@@ 1,9 1,11 @@ 
+
+using import .globals
 
 if (operating-system == 'windows)
     load-library
-        module-dir .. "/../bin/tukan_core.dll"
+        library-dir .. "/tukan_core.dll"
 else
     load-library
-        module-dir .. "/../bin/libtukan_core.so"
+        library-dir .. "/libtukan_core.so"
 
 none

          
M tukan/crypto.sc => lib/tukan/crypto.sc +0 -0

        
M tukan/csg.sc => lib/tukan/csg.sc +0 -0

        
M tukan/csgpainter.sc => lib/tukan/csgpainter.sc +0 -0

        
M tukan/db.sc => lib/tukan/db.sc +0 -0

        
M tukan/derivative.sc => lib/tukan/derivative.sc +0 -0

        
M tukan/dsp/delay.sc => lib/tukan/dsp/delay.sc +0 -0

        
M tukan/dsp/svf.sc => lib/tukan/dsp/svf.sc +0 -0

        
M tukan/dsp/utils.sc => lib/tukan/dsp/utils.sc +0 -0

        
M tukan/fog.sc => lib/tukan/fog.sc +0 -0

        
M tukan/gamecontrollerdb.sc => lib/tukan/gamecontrollerdb.sc +0 -0

        
M tukan/gl.sc => lib/tukan/gl.sc +2 -1
@@ 1,5 1,6 @@ 
 import .core
 using import .libc
+using import .globals
 using import glsl
 using import glm
 

          
@@ 13,7 14,7 @@ using import chaining
 
 vvv bind _GL
 include "glad.h"
-    options "-I" (module-dir .. "/../include") "-I" (module-dir .. "/../include/glad")
+    options "-I" include-dir "-I" (include-dir .. "/glad")
 
 fn translate-gl-symbols (scope source)
     fold (GL = scope) for k v in source

          
A => lib/tukan/globals.sc +15 -0
@@ 0,0 1,15 @@ 
+
+let base-dir =
+    .. module-dir "/../.."
+
+let
+    library-dir =
+        .. base-dir "/lib"
+    include-dir =
+        .. base-dir "/include"
+    cdefs-dir =
+        .. base-dir "/cdefs"
+    assets-dir =
+        .. base-dir "/share/tukan"
+
+locals;

          
M tukan/gpucall.sc => lib/tukan/gpucall.sc +0 -0

        
M tukan/hash.sc => lib/tukan/hash.sc +0 -0

        
M tukan/hashmap.sc => lib/tukan/hashmap.sc +0 -0

        
M tukan/icons/font_awesome.sc => lib/tukan/icons/font_awesome.sc +0 -0

        
M tukan/icons/init.sc => lib/tukan/icons/init.sc +0 -0

        
M tukan/icons/kenney.sc => lib/tukan/icons/kenney.sc +0 -0

        
M tukan/icons/material_design.sc => lib/tukan/icons/material_design.sc +0 -0

        
M tukan/imgui/cimgui.sc => lib/tukan/imgui/cimgui.sc +3 -2
@@ 1,11 1,12 @@ 
 
 import ..core
+using import ..globals
 
 vvv bind lib
 include
     options
-        \ "-I" (module-dir .. "/../../cdefs")
-        \ "-I" (module-dir .. "/../../include")
+        \ "-I" cdefs-dir
+        \ "-I" include-dir
         \ "-DIMGUI_DISABLE_INCLUDE_IMCONFIG_H"
     """"
         //#include "imgui.h"

          
M tukan/imgui/init.sc => lib/tukan/imgui/init.sc +0 -0

        
M tukan/input.sc => lib/tukan/input.sc +0 -0

        
M tukan/interval.sc => lib/tukan/interval.sc +0 -0

        
M tukan/isosurface.sc => lib/tukan/isosurface.sc +0 -0

        
M tukan/libc.sc => lib/tukan/libc.sc +0 -0

        
M tukan/lmdb.sc => lib/tukan/lmdb.sc +6 -12
@@ 1,20 1,15 @@ 
 import .core
+using import .globals
 
-if (operating-system == 'windows)
-    load-library "lmdb.dll"
+static-if (operating-system == 'windows)
+    static-library "lmdb.dll"
 else
-    load-library
-        module-dir .. "/../bin/liblmdb.so"
-
-let
-    CDEFS_PATH = (module-dir .. "/../cdefs")
-    #INCLUDE_PATH = (module-dir .. "/../include")
-
-run-stage;
+    static-library
+        library-dir .. "/liblmdb.so"
 
 vvv bind lmdb
 include
-    options "-I" CDEFS_PATH #"-I" INCLUDE_PATH
+    options "-I" cdefs-dir
     """"#include "lmdb.h"
 
         #define MDB_EXPORT_MACRO(NAME) int get_ ## NAME() { return NAME; }

          
@@ 22,7 17,6 @@ include
         MDB_EXPORT_MACRO(MDB_NOTFOUND)
         MDB_EXPORT_MACRO(MDB_KEYEXIST)
 
-
 do
     using lmdb.extern filter "^(mdb(.+)|get_MDB(.+))$"
     using lmdb.typedef filter "^(MDB(.+))$"

          
M tukan/main.sc => lib/tukan/main.sc +0 -0

        
M tukan/math.sc => lib/tukan/math.sc +0 -0

        
M tukan/mesh.sc => lib/tukan/mesh.sc +0 -0

        
M tukan/midi.sc => lib/tukan/midi.sc +0 -0

        
M tukan/module.sc => lib/tukan/module.sc +0 -0

        
M tukan/nanovg/C.sc => lib/tukan/nanovg/C.sc +0 -0

        
M tukan/nanovg/init.sc => lib/tukan/nanovg/init.sc +0 -0

        
M tukan/nfd.sc => lib/tukan/nfd.sc +2 -1
@@ 1,9 1,10 @@ 
 
 import .core
+using import .globals
 
 vvv bind nfd
 include "nfd.h"
-    options "-I" (module-dir .. "/../cdefs")
+    options "-I" cdefs-dir
 
 do
     using nfd.extern filter "^(nfd(.+)|NFD(.+))$"

          
M tukan/noise.sc => lib/tukan/noise.sc +0 -0

        
M tukan/normal.sc => lib/tukan/normal.sc +0 -0

        
M tukan/ode/C.sc => lib/tukan/ode/C.sc +0 -0

        
M tukan/ode/init.sc => lib/tukan/ode/init.sc +0 -0

        
M tukan/oui.sc => lib/tukan/oui.sc +0 -0

        
M tukan/packing.sc => lib/tukan/packing.sc +0 -0

        
M tukan/pcg.sc => lib/tukan/pcg.sc +0 -0

        
M tukan/perfect_hash.sc => lib/tukan/perfect_hash.sc +0 -0

        
M tukan/portmidi.sc => lib/tukan/portmidi.sc +0 -0

        
M tukan/projection.sc => lib/tukan/projection.sc +0 -0

        
M tukan/random.sc => lib/tukan/random.sc +0 -0

        
M tukan/raytrace.sc => lib/tukan/raytrace.sc +0 -0

        
M tukan/rotation.sc => lib/tukan/rotation.sc +0 -0

        
M tukan/sdf.sc => lib/tukan/sdf.sc +0 -0

        
M tukan/sdl.sc => lib/tukan/sdl.sc +3 -6
@@ 1,20 1,17 @@ 
 import .core
+using import .globals
 
 if (operating-system == 'windows)
     load-library "SDL2.dll"
 else
     load-library
-        module-dir .. "/../bin/libSDL2-2.0.so.0"
-
-let
-    CDEFS_PATH = (module-dir .. "/../cdefs")
-    INCLUDE_PATH = (module-dir .. "/../include")
+        library-dir .. "/libSDL2-2.0.so.0"
 
 run-stage;
 
 vvv bind SDL
 include
-    options "-I" CDEFS_PATH "-I" INCLUDE_PATH
+    options "-I" cdefs-dir "-I" include-dir
     """"#include <stdbool.h>
         #include "SDL2/SDL.h"
         #include "SDL2/SDL_syswm.h"

          
M tukan/ssao.sc => lib/tukan/ssao.sc +0 -0

        
M tukan/stage.sc => lib/tukan/stage.sc +0 -0

        
M tukan/thread.sc => lib/tukan/thread.sc +0 -0

        
M tukan/timing.sc => lib/tukan/timing.sc +0 -0

        
M tukan/use.sc => lib/tukan/use.sc +0 -0

        
M tukan/view/blocktree.sc => lib/tukan/view/blocktree.sc +0 -0

        
M tukan/view/events.sc => lib/tukan/view/events.sc +0 -0

        
M tukan/view/hexedit.sc => lib/tukan/view/hexedit.sc +0 -0

        
M tukan/view/old-code.sc => lib/tukan/view/old-code.sc +0 -0

        
M tukan/view/shader.sc => lib/tukan/view/shader.sc +0 -0

        
M tukan/voxel.sc => lib/tukan/voxel.sc +0 -0

        
M tukan/vulkan.sc => lib/tukan/vulkan.sc +0 -0

        
M assets/core/fonts/DejaVuSans.ttf => share/tukan/fonts/DejaVuSans.ttf +0 -0

        
M assets/core/fonts/MaterialIcons-Regular.ttf => share/tukan/fonts/MaterialIcons-Regular.ttf +0 -0

        
M assets/core/fonts/UbuntuMono-R.ttf => share/tukan/fonts/UbuntuMono-R.ttf +0 -0

        
M assets/core/fonts/bmonofont-i18n.ttf => share/tukan/fonts/bmonofont-i18n.ttf +0 -0

        
M assets/core/fonts/droidsans.ttf => share/tukan/fonts/droidsans.ttf +0 -0

        
M assets/core/fonts/fontawesome-webfont.ttf => share/tukan/fonts/fontawesome-webfont.ttf +0 -0

        
M assets/core/fonts/kenney-icon-font.ttf => share/tukan/fonts/kenney-icon-font.ttf +0 -0

        
M assets/core/fonts/raleway_thin.ttf => share/tukan/fonts/raleway_thin.ttf +0 -0

        
M assets/core/shaders/flat/simple.glsl => share/tukan/shaders/flat/simple.glsl +0 -0

        
M assets/core/shaders/font/font.glsl => share/tukan/shaders/font/font.glsl +0 -0

        
M assets/core/shaders/font/font_gshader.fs => share/tukan/shaders/font/font_gshader.fs +0 -0

        
M assets/core/shaders/font/font_gshader.vs => share/tukan/shaders/font/font_gshader.vs +0 -0

        
M assets/core/shaders/font/simple.glsl => share/tukan/shaders/font/simple.glsl +0 -0

        
M assets/core/shaders/g/gbuffer_attr.glsl => share/tukan/shaders/g/gbuffer_attr.glsl +0 -0

        
M assets/core/shaders/g/gshader.glsl => share/tukan/shaders/g/gshader.glsl +0 -0

        
M assets/core/shaders/g/gshader_frag.glsl => share/tukan/shaders/g/gshader_frag.glsl +0 -0

        
M assets/core/shaders/g/gshader_sdf.glsl => share/tukan/shaders/g/gshader_sdf.glsl +0 -0

        
M assets/core/shaders/g/gshader_vars.glsl => share/tukan/shaders/g/gshader_vars.glsl +0 -0

        
M assets/core/shaders/g/gshader_vert.glsl => share/tukan/shaders/g/gshader_vert.glsl +0 -0

        
M assets/core/shaders/g/lpv/propagate.glsl => share/tukan/shaders/g/lpv/propagate.glsl +0 -0

        
M assets/core/shaders/g/ppfx/dof-mblur.glsl => share/tukan/shaders/g/ppfx/dof-mblur.glsl +0 -0

        
M assets/core/shaders/g/ppfx/gshader.glsl => share/tukan/shaders/g/ppfx/gshader.glsl +0 -0

        
M assets/core/shaders/g/ppfx/gshader_frag.glsl => share/tukan/shaders/g/ppfx/gshader_frag.glsl +0 -0

        
M assets/core/shaders/g/ppfx/light_direct.glsl => share/tukan/shaders/g/ppfx/light_direct.glsl +0 -0

        
M assets/core/shaders/g/ppfx/light_proj.glsl => share/tukan/shaders/g/ppfx/light_proj.glsl +0 -0

        
M assets/core/shaders/g/ppfx/light_shgrid.glsl => share/tukan/shaders/g/ppfx/light_shgrid.glsl +0 -0

        
M assets/core/shaders/g/ppfx/ssao.glsl => share/tukan/shaders/g/ppfx/ssao.glsl +0 -0

        
M assets/core/shaders/g/ppfx/ssgi.glsl => share/tukan/shaders/g/ppfx/ssgi.glsl +0 -0

        
M assets/core/shaders/g/ppfx/view_ray.glsl => share/tukan/shaders/g/ppfx/view_ray.glsl +0 -0

        
M assets/core/shaders/g/skybox.glsl => share/tukan/shaders/g/skybox.glsl +0 -0

        
M assets/core/shaders/lib/blur.glsl => share/tukan/shaders/lib/blur.glsl +0 -0

        
M assets/core/shaders/lib/brdf.glsl => share/tukan/shaders/lib/brdf.glsl +0 -0

        
M assets/core/shaders/lib/cc.glsl => share/tukan/shaders/lib/cc.glsl +0 -0

        
M assets/core/shaders/lib/dither.glsl => share/tukan/shaders/lib/dither.glsl +0 -0

        
M assets/core/shaders/lib/evsm.glsl => share/tukan/shaders/lib/evsm.glsl +0 -0

        
M assets/core/shaders/lib/ext.glsl => share/tukan/shaders/lib/ext.glsl +0 -0

        
M assets/core/shaders/lib/fcc.glsl => share/tukan/shaders/lib/fcc.glsl +0 -0

        
M assets/core/shaders/lib/filmic.glsl => share/tukan/shaders/lib/filmic.glsl +0 -0

        
M assets/core/shaders/lib/fog.glsl => share/tukan/shaders/lib/fog.glsl +0 -0

        
M assets/core/shaders/lib/hammersley.glsl => share/tukan/shaders/lib/hammersley.glsl +0 -0

        
M assets/core/shaders/lib/hslhsv.glsl => share/tukan/shaders/lib/hslhsv.glsl +0 -0

        
M assets/core/shaders/lib/ibl_sample.glsl => share/tukan/shaders/lib/ibl_sample.glsl +0 -0

        
M assets/core/shaders/lib/mapping.glsl => share/tukan/shaders/lib/mapping.glsl +0 -0

        
M assets/core/shaders/lib/math.glsl => share/tukan/shaders/lib/math.glsl +0 -0

        
M assets/core/shaders/lib/normal_codec.glsl => share/tukan/shaders/lib/normal_codec.glsl +0 -0

        
M assets/core/shaders/lib/packing.glsl => share/tukan/shaders/lib/packing.glsl +0 -0

        
M assets/core/shaders/lib/perturb.glsl => share/tukan/shaders/lib/perturb.glsl +0 -0

        
M assets/core/shaders/lib/projection.glsl => share/tukan/shaders/lib/projection.glsl +0 -0

        
M assets/core/shaders/lib/quaternion.glsl => share/tukan/shaders/lib/quaternion.glsl +0 -0

        
M assets/core/shaders/lib/sdf_math.glsl => share/tukan/shaders/lib/sdf_math.glsl +0 -0

        
M assets/core/shaders/lib/sh.glsl => share/tukan/shaders/lib/sh.glsl +0 -0

        
M assets/core/shaders/lib/snoise3.glsl => share/tukan/shaders/lib/snoise3.glsl +0 -0

        
M assets/core/shaders/lib/srgb.glsl => share/tukan/shaders/lib/srgb.glsl +0 -0

        
M assets/core/shaders/lib/svd.glsl => share/tukan/shaders/lib/svd.glsl +0 -0

        
M assets/core/shaders/lib/tetfacets.glsl => share/tukan/shaders/lib/tetfacets.glsl +0 -0

        
M assets/core/shaders/lib/ycbcr.glsl => share/tukan/shaders/lib/ycbcr.glsl +0 -0

        
M assets/core/shaders/lib/ycocg.glsl => share/tukan/shaders/lib/ycocg.glsl +0 -0

        
M assets/core/shaders/nm/nm_frag.glsl => share/tukan/shaders/nm/nm_frag.glsl +0 -0

        
M assets/core/shaders/nm/nm_vars.glsl => share/tukan/shaders/nm/nm_vars.glsl +0 -0

        
M assets/core/shaders/nm/nm_vert.glsl => share/tukan/shaders/nm/nm_vert.glsl +0 -0

        
M assets/core/shaders/pom/pom_frag.glsl => share/tukan/shaders/pom/pom_frag.glsl +0 -0

        
M assets/core/shaders/pom/pom_vars.glsl => share/tukan/shaders/pom/pom_vars.glsl +0 -0

        
M assets/core/shaders/pom/pom_vert.glsl => share/tukan/shaders/pom/pom_vert.glsl +0 -0

        
M assets/core/shaders/ppfx/blit.glsl => share/tukan/shaders/ppfx/blit.glsl +0 -0

        
M assets/core/shaders/ppfx/blit_layers.glsl => share/tukan/shaders/ppfx/blit_layers.glsl +0 -0

        
M assets/core/shaders/ppfx/bloom_mixdown.glsl => share/tukan/shaders/ppfx/bloom_mixdown.glsl +0 -0

        
M assets/core/shaders/ppfx/blur.glsl => share/tukan/shaders/ppfx/blur.glsl +0 -0

        
M assets/core/shaders/ppfx/copy.glsl => share/tukan/shaders/ppfx/copy.glsl +0 -0

        
M assets/core/shaders/ppfx/copy_luma_ds2.glsl => share/tukan/shaders/ppfx/copy_luma_ds2.glsl +0 -0

        
M assets/core/shaders/ppfx/debug_color.glsl => share/tukan/shaders/ppfx/debug_color.glsl +0 -0

        
M assets/core/shaders/ppfx/debug_layer_color.glsl => share/tukan/shaders/ppfx/debug_layer_color.glsl +0 -0

        
M assets/core/shaders/ppfx/debug_layer_depth.glsl => share/tukan/shaders/ppfx/debug_layer_depth.glsl +0 -0

        
M assets/core/shaders/ppfx/debug_material.glsl => share/tukan/shaders/ppfx/debug_material.glsl +0 -0

        
M assets/core/shaders/ppfx/debug_normal.glsl => share/tukan/shaders/ppfx/debug_normal.glsl +0 -0

        
M assets/core/shaders/ppfx/debug_velocity.glsl => share/tukan/shaders/ppfx/debug_velocity.glsl +0 -0

        
M assets/core/shaders/ppfx/debug_ycocg.glsl => share/tukan/shaders/ppfx/debug_ycocg.glsl +0 -0

        
M assets/core/shaders/ppfx/derivative_map.glsl => share/tukan/shaders/ppfx/derivative_map.glsl +0 -0

        
M assets/core/shaders/ppfx/fxaa3_11.glsl => share/tukan/shaders/ppfx/fxaa3_11.glsl +0 -0

        
M assets/core/shaders/ppfx/luma.glsl => share/tukan/shaders/ppfx/luma.glsl +0 -0

        
M assets/core/shaders/ppfx/oculus_rift.glsl => share/tukan/shaders/ppfx/oculus_rift.glsl +0 -0

        
M assets/core/shaders/ppfx/ppfx_debug_depth.fs => share/tukan/shaders/ppfx/ppfx_debug_depth.fs +0 -0

        
M assets/core/shaders/ppfx/ppfx_hdr_clip.fs => share/tukan/shaders/ppfx/ppfx_hdr_clip.fs +0 -0

        
M assets/core/shaders/ppfx/ppfx_max.fs => share/tukan/shaders/ppfx/ppfx_max.fs +0 -0

        
M assets/core/shaders/ppfx/tonemap.glsl => share/tukan/shaders/ppfx/tonemap.glsl +0 -0

        
M assets/core/shaders/profiler/simple.glsl => share/tukan/shaders/profiler/simple.glsl +0 -0

        
M assets/core/shaders/sm/font_shadow.fs => share/tukan/shaders/sm/font_shadow.fs +0 -0

        
M assets/core/shaders/sm/font_shadow.vs => share/tukan/shaders/sm/font_shadow.vs +0 -0

        
M assets/core/shaders/sm/ppfx/blur_evsm.glsl => share/tukan/shaders/sm/ppfx/blur_evsm.glsl +0 -0

        
M assets/core/shaders/sm/ppfx/convert_evsm.glsl => share/tukan/shaders/sm/ppfx/convert_evsm.glsl +0 -0

        
M assets/core/shaders/sm/shadow.glsl => share/tukan/shaders/sm/shadow.glsl +0 -0

        
M assets/core/shaders/sm/shadow_frag.glsl => share/tukan/shaders/sm/shadow_frag.glsl +0 -0

        
M assets/core/shaders/std/attrib.glsl => share/tukan/shaders/std/attrib.glsl +0 -0

        
M assets/core/shaders/std/compat.glsl => share/tukan/shaders/std/compat.glsl +0 -0

        
M assets/core/shaders/std/std.glsl => share/tukan/shaders/std/std.glsl +0 -0

        
M assets/core/shaders/std/ubo.glsl => share/tukan/shaders/std/ubo.glsl +0 -0

        
M assets/core/shaders/std/varying.glsl => share/tukan/shaders/std/varying.glsl +0 -0

        
M assets/core/shaders/std/vq.glsl => share/tukan/shaders/std/vq.glsl +0 -0

        
M assets/core/shaders/ui2d/ninepatch2d.glsl => share/tukan/shaders/ui2d/ninepatch2d.glsl +0 -0

        
M assets/core/shaders/ui2d/quad2d.glsl => share/tukan/shaders/ui2d/quad2d.glsl +0 -0

        
M assets/core/shaders/ui2d/ui2d.glsl => share/tukan/shaders/ui2d/ui2d.glsl +0 -0

        
M assets/core/textures/blank.png => share/tukan/textures/blank.png +0 -0

        
M assets/core/textures/blender_icons16.png => share/tukan/textures/blender_icons16.png +0 -0

        
M assets/core/textures/lut_default.png => share/tukan/textures/lut_default.png +0 -0

        
M assets/core/textures/spot.png => share/tukan/textures/spot.png +0 -0

        
M assets/core/textures/zero.png => share/tukan/textures/zero.png +0 -0

        
R tukan-console =>  +0 -7
@@ 1,7 0,0 @@ 
-#!/usr/bin/env scopes
-
-hide-traceback;
-load-module ""
-    find-module-path module-dir ".tukan.console"
-    scope = (__this-scope)
-    main-module? = true