diff --git a/bin/linux/libcgltf_dll.so b/bin/linux/libcgltf_dll.so old mode 100644 new mode 100755 index d2dcb68..4d6a877 Binary files a/bin/linux/libcgltf_dll.so and b/bin/linux/libcgltf_dll.so differ diff --git a/bin/linux/libduktape_dll.so b/bin/linux/libduktape_dll.so old mode 100644 new mode 100755 index 8391bba..37a0d53 Binary files a/bin/linux/libduktape_dll.so and b/bin/linux/libduktape_dll.so differ diff --git a/bin/linux/libhmm_dll.so b/bin/linux/libhmm_dll.so old mode 100644 new mode 100755 index 4c2aee1..d76e053 Binary files a/bin/linux/libhmm_dll.so and b/bin/linux/libhmm_dll.so differ diff --git a/bin/linux/libremotery_dll.so b/bin/linux/libremotery_dll.so index 5b9411a..0e19a5a 100755 Binary files a/bin/linux/libremotery_dll.so and b/bin/linux/libremotery_dll.so differ diff --git a/bin/linux/libsokol_debug_dll.so b/bin/linux/libsokol_debug_dll.so old mode 100644 new mode 100755 index ca51b60..3ad9d98 Binary files a/bin/linux/libsokol_debug_dll.so and b/bin/linux/libsokol_debug_dll.so differ diff --git a/bin/linux/libsokol_dll.so b/bin/linux/libsokol_dll.so old mode 100644 new mode 100755 index fb26425..73f4c0d Binary files a/bin/linux/libsokol_dll.so and b/bin/linux/libsokol_dll.so differ diff --git a/bin/linux/libsokol_gp_dll.so b/bin/linux/libsokol_gp_dll.so old mode 100644 new mode 100755 index 3007267..834e3fc Binary files a/bin/linux/libsokol_gp_dll.so and b/bin/linux/libsokol_gp_dll.so differ diff --git a/bin/linux/libsokol_nuklear_dll.so b/bin/linux/libsokol_nuklear_dll.so old mode 100644 new mode 100755 index 0df36d5..694a05a Binary files a/bin/linux/libsokol_nuklear_dll.so and b/bin/linux/libsokol_nuklear_dll.so differ diff --git a/bin/linux/libsokol_shape_dll.so b/bin/linux/libsokol_shape_dll.so old mode 100644 new mode 100755 index 294fb8d..2c90a0b Binary files a/bin/linux/libsokol_shape_dll.so and b/bin/linux/libsokol_shape_dll.so differ diff --git a/bin/linux/libstb_dll.so b/bin/linux/libstb_dll.so old mode 100644 new mode 100755 index a5eab25..86c65b6 Binary files a/bin/linux/libstb_dll.so and b/bin/linux/libstb_dll.so differ diff --git a/bin/shaderbin/shader_gen.h b/bin/shaderbin/shader_gen.h index 3c93afc..50cd0bc 100644 --- a/bin/shaderbin/shader_gen.h +++ b/bin/shaderbin/shader_gen.h @@ -1,123 +1,123 @@ -#pragma once -/* - #version:1# (machine generated, don't edit!) - - Generated by sokol-shdc (https://github.com/floooh/sokol-tools) - - Cmdline: - sokol-shdc -i ./projects/examples/samples/cube-sapp.glsl -o F:\dev\luajit\repos\sokol-luajit\bin\shaderbin\shader_gen.h -l glsl410 -f sokol - - Overview: - ========= - Shader program: 'cube': - Get shader desc: cube_shader_desc(sg_query_backend()); - Vertex Shader: vs - Fragment Shader: fs - Attributes: - ATTR_cube_position => 0 - ATTR_cube_color0 => 1 - Bindings: - Uniform block 'vs_params': - C struct: vs_params_t - Bind slot: UB_vs_params => 0 -*/ -#if !defined(SOKOL_GFX_INCLUDED) -#error "Please include sokol_gfx.h before shader_gen.h" -#endif -#if !defined(SOKOL_SHDC_ALIGN) -#if defined(_MSC_VER) -#define SOKOL_SHDC_ALIGN(a) __declspec(align(a)) -#else -#define SOKOL_SHDC_ALIGN(a) __attribute__((aligned(a))) -#endif -#endif -#define ATTR_cube_position (0) -#define ATTR_cube_color0 (1) -#define UB_vs_params (0) -#pragma pack(push,1) -SOKOL_SHDC_ALIGN(16) typedef struct vs_params_t { - hmm_mat4 mvp; -} vs_params_t; -#pragma pack(pop) -/* - #version 410 - - uniform vec4 vs_params[4]; - layout(location = 0) in vec4 position; - layout(location = 0) out vec4 color; - layout(location = 1) in vec4 color0; - - void main() - { - gl_Position = mat4(vs_params[0], vs_params[1], vs_params[2], vs_params[3]) * position; - color = color0; - } - -*/ -static const uint8_t vs_source_glsl410[284] = { - 0x23,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x34,0x31,0x30,0x0a,0x0a,0x75,0x6e, - 0x69,0x66,0x6f,0x72,0x6d,0x20,0x76,0x65,0x63,0x34,0x20,0x76,0x73,0x5f,0x70,0x61, - 0x72,0x61,0x6d,0x73,0x5b,0x34,0x5d,0x3b,0x0a,0x6c,0x61,0x79,0x6f,0x75,0x74,0x28, - 0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20,0x30,0x29,0x20,0x69,0x6e, - 0x20,0x76,0x65,0x63,0x34,0x20,0x70,0x6f,0x73,0x69,0x74,0x69,0x6f,0x6e,0x3b,0x0a, - 0x6c,0x61,0x79,0x6f,0x75,0x74,0x28,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x20, - 0x3d,0x20,0x30,0x29,0x20,0x6f,0x75,0x74,0x20,0x76,0x65,0x63,0x34,0x20,0x63,0x6f, - 0x6c,0x6f,0x72,0x3b,0x0a,0x6c,0x61,0x79,0x6f,0x75,0x74,0x28,0x6c,0x6f,0x63,0x61, - 0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20,0x31,0x29,0x20,0x69,0x6e,0x20,0x76,0x65,0x63, - 0x34,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x30,0x3b,0x0a,0x0a,0x76,0x6f,0x69,0x64,0x20, - 0x6d,0x61,0x69,0x6e,0x28,0x29,0x0a,0x7b,0x0a,0x20,0x20,0x20,0x20,0x67,0x6c,0x5f, - 0x50,0x6f,0x73,0x69,0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20,0x6d,0x61,0x74,0x34,0x28, - 0x76,0x73,0x5f,0x70,0x61,0x72,0x61,0x6d,0x73,0x5b,0x30,0x5d,0x2c,0x20,0x76,0x73, - 0x5f,0x70,0x61,0x72,0x61,0x6d,0x73,0x5b,0x31,0x5d,0x2c,0x20,0x76,0x73,0x5f,0x70, - 0x61,0x72,0x61,0x6d,0x73,0x5b,0x32,0x5d,0x2c,0x20,0x76,0x73,0x5f,0x70,0x61,0x72, - 0x61,0x6d,0x73,0x5b,0x33,0x5d,0x29,0x20,0x2a,0x20,0x70,0x6f,0x73,0x69,0x74,0x69, - 0x6f,0x6e,0x3b,0x0a,0x20,0x20,0x20,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x20,0x3d,0x20, - 0x63,0x6f,0x6c,0x6f,0x72,0x30,0x3b,0x0a,0x7d,0x0a,0x0a,0x00, -}; -/* - #version 410 - - layout(location = 0) out vec4 frag_color; - layout(location = 0) in vec4 color; - - void main() - { - frag_color = color; - } - -*/ -static const uint8_t fs_source_glsl410[135] = { - 0x23,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x34,0x31,0x30,0x0a,0x0a,0x6c,0x61, - 0x79,0x6f,0x75,0x74,0x28,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20, - 0x30,0x29,0x20,0x6f,0x75,0x74,0x20,0x76,0x65,0x63,0x34,0x20,0x66,0x72,0x61,0x67, - 0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x3b,0x0a,0x6c,0x61,0x79,0x6f,0x75,0x74,0x28,0x6c, - 0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20,0x30,0x29,0x20,0x69,0x6e,0x20, - 0x76,0x65,0x63,0x34,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3b,0x0a,0x0a,0x76,0x6f,0x69, - 0x64,0x20,0x6d,0x61,0x69,0x6e,0x28,0x29,0x0a,0x7b,0x0a,0x20,0x20,0x20,0x20,0x66, - 0x72,0x61,0x67,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x20,0x3d,0x20,0x63,0x6f,0x6c,0x6f, - 0x72,0x3b,0x0a,0x7d,0x0a,0x0a,0x00, -}; -static inline const sg_shader_desc* cube_shader_desc(sg_backend backend) { - if (backend == SG_BACKEND_GLCORE) { - static sg_shader_desc desc; - static bool valid; - if (!valid) { - valid = true; - desc.vertex_func.source = (const char*)vs_source_glsl410; - desc.vertex_func.entry = "main"; - desc.fragment_func.source = (const char*)fs_source_glsl410; - desc.fragment_func.entry = "main"; - desc.attrs[0].glsl_name = "position"; - desc.attrs[1].glsl_name = "color0"; - desc.uniform_blocks[0].stage = SG_SHADERSTAGE_VERTEX; - desc.uniform_blocks[0].layout = SG_UNIFORMLAYOUT_STD140; - desc.uniform_blocks[0].size = 64; - desc.uniform_blocks[0].glsl_uniforms[0].type = SG_UNIFORMTYPE_FLOAT4; - desc.uniform_blocks[0].glsl_uniforms[0].array_count = 4; - desc.uniform_blocks[0].glsl_uniforms[0].glsl_name = "vs_params"; - desc.label = "cube_shader"; - } - return &desc; - } - return 0; -} +#pragma once +/* + #version:1# (machine generated, don't edit!) + + Generated by sokol-shdc (https://github.com/floooh/sokol-tools) + + Cmdline: + sokol-shdc -i ./projects/examples/samples/cube-sapp.glsl -o /home/dlannan/store1/Development/lua/repos/sokol-luajit/bin/shaderbin/shader_gen.h -l glsl410 -f sokol + + Overview: + ========= + Shader program: 'cube': + Get shader desc: cube_shader_desc(sg_query_backend()); + Vertex Shader: vs + Fragment Shader: fs + Attributes: + ATTR_cube_position => 0 + ATTR_cube_color0 => 1 + Bindings: + Uniform block 'vs_params': + C struct: vs_params_t + Bind slot: UB_vs_params => 0 +*/ +#if !defined(SOKOL_GFX_INCLUDED) +#error "Please include sokol_gfx.h before shader_gen.h" +#endif +#if !defined(SOKOL_SHDC_ALIGN) +#if defined(_MSC_VER) +#define SOKOL_SHDC_ALIGN(a) __declspec(align(a)) +#else +#define SOKOL_SHDC_ALIGN(a) __attribute__((aligned(a))) +#endif +#endif +#define ATTR_cube_position (0) +#define ATTR_cube_color0 (1) +#define UB_vs_params (0) +#pragma pack(push,1) +SOKOL_SHDC_ALIGN(16) typedef struct vs_params_t { + hmm_mat4 mvp; +} vs_params_t; +#pragma pack(pop) +/* + #version 410 + + uniform vec4 vs_params[4]; + layout(location = 0) in vec4 position; + layout(location = 0) out vec4 color; + layout(location = 1) in vec4 color0; + + void main() + { + gl_Position = mat4(vs_params[0], vs_params[1], vs_params[2], vs_params[3]) * position; + color = color0; + } + +*/ +static const uint8_t vs_source_glsl410[284] = { + 0x23,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x34,0x31,0x30,0x0a,0x0a,0x75,0x6e, + 0x69,0x66,0x6f,0x72,0x6d,0x20,0x76,0x65,0x63,0x34,0x20,0x76,0x73,0x5f,0x70,0x61, + 0x72,0x61,0x6d,0x73,0x5b,0x34,0x5d,0x3b,0x0a,0x6c,0x61,0x79,0x6f,0x75,0x74,0x28, + 0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20,0x30,0x29,0x20,0x69,0x6e, + 0x20,0x76,0x65,0x63,0x34,0x20,0x70,0x6f,0x73,0x69,0x74,0x69,0x6f,0x6e,0x3b,0x0a, + 0x6c,0x61,0x79,0x6f,0x75,0x74,0x28,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x20, + 0x3d,0x20,0x30,0x29,0x20,0x6f,0x75,0x74,0x20,0x76,0x65,0x63,0x34,0x20,0x63,0x6f, + 0x6c,0x6f,0x72,0x3b,0x0a,0x6c,0x61,0x79,0x6f,0x75,0x74,0x28,0x6c,0x6f,0x63,0x61, + 0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20,0x31,0x29,0x20,0x69,0x6e,0x20,0x76,0x65,0x63, + 0x34,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x30,0x3b,0x0a,0x0a,0x76,0x6f,0x69,0x64,0x20, + 0x6d,0x61,0x69,0x6e,0x28,0x29,0x0a,0x7b,0x0a,0x20,0x20,0x20,0x20,0x67,0x6c,0x5f, + 0x50,0x6f,0x73,0x69,0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20,0x6d,0x61,0x74,0x34,0x28, + 0x76,0x73,0x5f,0x70,0x61,0x72,0x61,0x6d,0x73,0x5b,0x30,0x5d,0x2c,0x20,0x76,0x73, + 0x5f,0x70,0x61,0x72,0x61,0x6d,0x73,0x5b,0x31,0x5d,0x2c,0x20,0x76,0x73,0x5f,0x70, + 0x61,0x72,0x61,0x6d,0x73,0x5b,0x32,0x5d,0x2c,0x20,0x76,0x73,0x5f,0x70,0x61,0x72, + 0x61,0x6d,0x73,0x5b,0x33,0x5d,0x29,0x20,0x2a,0x20,0x70,0x6f,0x73,0x69,0x74,0x69, + 0x6f,0x6e,0x3b,0x0a,0x20,0x20,0x20,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x20,0x3d,0x20, + 0x63,0x6f,0x6c,0x6f,0x72,0x30,0x3b,0x0a,0x7d,0x0a,0x0a,0x00, +}; +/* + #version 410 + + layout(location = 0) out vec4 frag_color; + layout(location = 0) in vec4 color; + + void main() + { + frag_color = color; + } + +*/ +static const uint8_t fs_source_glsl410[135] = { + 0x23,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x34,0x31,0x30,0x0a,0x0a,0x6c,0x61, + 0x79,0x6f,0x75,0x74,0x28,0x6c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20, + 0x30,0x29,0x20,0x6f,0x75,0x74,0x20,0x76,0x65,0x63,0x34,0x20,0x66,0x72,0x61,0x67, + 0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x3b,0x0a,0x6c,0x61,0x79,0x6f,0x75,0x74,0x28,0x6c, + 0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x20,0x3d,0x20,0x30,0x29,0x20,0x69,0x6e,0x20, + 0x76,0x65,0x63,0x34,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3b,0x0a,0x0a,0x76,0x6f,0x69, + 0x64,0x20,0x6d,0x61,0x69,0x6e,0x28,0x29,0x0a,0x7b,0x0a,0x20,0x20,0x20,0x20,0x66, + 0x72,0x61,0x67,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x20,0x3d,0x20,0x63,0x6f,0x6c,0x6f, + 0x72,0x3b,0x0a,0x7d,0x0a,0x0a,0x00, +}; +static inline const sg_shader_desc* cube_shader_desc(sg_backend backend) { + if (backend == SG_BACKEND_GLCORE) { + static sg_shader_desc desc; + static bool valid; + if (!valid) { + valid = true; + desc.vertex_func.source = (const char*)vs_source_glsl410; + desc.vertex_func.entry = "main"; + desc.fragment_func.source = (const char*)fs_source_glsl410; + desc.fragment_func.entry = "main"; + desc.attrs[0].glsl_name = "position"; + desc.attrs[1].glsl_name = "color0"; + desc.uniform_blocks[0].stage = SG_SHADERSTAGE_VERTEX; + desc.uniform_blocks[0].layout = SG_UNIFORMLAYOUT_STD140; + desc.uniform_blocks[0].size = 64; + desc.uniform_blocks[0].glsl_uniforms[0].type = SG_UNIFORMTYPE_FLOAT4; + desc.uniform_blocks[0].glsl_uniforms[0].array_count = 4; + desc.uniform_blocks[0].glsl_uniforms[0].glsl_name = "vs_params"; + desc.label = "cube_shader"; + } + return &desc; + } + return 0; +} diff --git a/ffi/sokol/clay.lua b/ffi/sokol/clay.lua index 19a52dc..2f4569a 100644 --- a/ffi/sokol/clay.lua +++ b/ffi/sokol/clay.lua @@ -4,7 +4,7 @@ local sokol_filename = _G.SOKOL_DLL or "clay_dll" local libs = ffi_clay or { OSX = { x64 = sokol_filename..".so" }, Windows = { x64 = sokol_filename..".dll" }, - Linux = { x64 = sokol_filename..".so", arm = sokol_filename..".so" }, + Linux = { x64 = "./bin/linux/lib"..sokol_filename..".so", arm = "./bin/linux/lib"..sokol_filename..".so" }, BSD = { x64 = sokol_filename..".so" }, POSIX = { x64 = sokol_filename..".so" }, Other = { x64 = sokol_filename..".so" }, diff --git a/ffi/sokol/hmm.lua b/ffi/sokol/hmm.lua index 4142766..d6fbc3a 100644 --- a/ffi/sokol/hmm.lua +++ b/ffi/sokol/hmm.lua @@ -3,7 +3,7 @@ local ffi = require( "ffi" ) local libs = ffi_hmm_dll or { OSX = { x64 = "hmm_dll_macos.so", arm64 = "hmm_dll_macos_arm64.so" }, Windows = { x64 = "hmm_dll.dll" }, - Linux = { x64 = "hmm_dll.so", arm = "hmm_dll.so" }, + Linux = { x64 = "./bin/linux/lib".."hmm_dll.so", arm = "./bin/linux/lib".."hmm_dll.so" }, BSD = { x64 = "hmm_dll.so" }, POSIX = { x64 = "hmm_dll.so" }, Other = { x64 = "hmm_dll.so" }, diff --git a/ffi/sokol/remotery.lua b/ffi/sokol/remotery.lua index 6704ac8..82b6962 100644 --- a/ffi/sokol/remotery.lua +++ b/ffi/sokol/remotery.lua @@ -3,7 +3,7 @@ local ffi = require( "ffi" ) local libs = ffi_remotery_dll or { OSX = { x64 = "remotery_dll" }, Windows = { x64 = "remotery_dll.dll" }, - Linux = { x64 = "remotery_dll.so", arm = "remotery_dll.so" }, + Linux = { x64 = "./bin/linux/lib".."remotery_dll.so", arm = "./bin/linux/lib".."remotery_dll.so" }, BSD = { x64 = "remotery_dll.so" }, POSIX = { x64 = "remotery_dll.so" }, Other = { x64 = "remotery_dll.so" }, diff --git a/ffi/sokol/sokol_app.lua b/ffi/sokol/sokol_app.lua index d905ca9..ef862f7 100644 --- a/ffi/sokol/sokol_app.lua +++ b/ffi/sokol/sokol_app.lua @@ -6,7 +6,7 @@ local sokol_filename = _G.SOKOL_DLL or "sokol_dll" local libs = ffi_sokol_app or { OSX = { x64 = sokol_filename.."_macos.so", arm64 = sokol_filename.."_macos_arm64.so" }, Windows = { x64 = sokol_filename..".dll" }, - Linux = { x64 = "lib"..sokol_filename..".so", arm = "lib"..sokol_filename..".so" }, + Linux = { x64 = "./bin/linux/lib"..sokol_filename..".so", arm = "./bin/linux/lib"..sokol_filename..".so" }, BSD = { x64 = sokol_filename..".so" }, POSIX = { x64 = sokol_filename..".so" }, Other = { x64 = sokol_filename..".so" }, diff --git a/ffi/sokol/sokol_gfx.lua b/ffi/sokol/sokol_gfx.lua index 091b9b1..66d69ef 100644 --- a/ffi/sokol/sokol_gfx.lua +++ b/ffi/sokol/sokol_gfx.lua @@ -4,7 +4,7 @@ local sokol_filename = _G.SOKOL_DLL or "sokol_dll" local libs = ffi_sokol_gfx or { OSX = { x64 = sokol_filename.."_macos.so", arm64 = sokol_filename.."_macos_arm64.so" }, Windows = { x64 = sokol_filename..".dll" }, - Linux = { x64 = sokol_filename..".so", arm = sokol_filename..".so" }, + Linux = { x64 = "./bin/linux/lib"..sokol_filename..".so", arm = "./bin/linux/lib"..sokol_filename..".so" }, BSD = { x64 = sokol_filename..".so" }, POSIX = { x64 = sokol_filename..".so" }, Other = { x64 = sokol_filename..".so" }, diff --git a/ffi/sokol/sokol_gp.lua b/ffi/sokol/sokol_gp.lua index a777cf0..ed4800c 100644 --- a/ffi/sokol/sokol_gp.lua +++ b/ffi/sokol/sokol_gp.lua @@ -4,7 +4,7 @@ local sokol_filename = _G.SOKOL_GP_DLL or "sokol_gp_dll" local libs = ffi_sokol_gfx or { OSX = { x64 = sokol_filename.."_macos.so", arm64 = sokol_filename.."_macos_arm64.so" }, Windows = { x64 = sokol_filename..".dll" }, - Linux = { x64 = sokol_filename..".so", arm = sokol_filename..".so" }, + Linux = { x64 = "./bin/linux/lib"..sokol_filename..".so", arm = "./bin/linux/lib"..sokol_filename..".so" }, BSD = { x64 = sokol_filename..".so" }, POSIX = { x64 = sokol_filename..".so" }, Other = { x64 = sokol_filename..".so" }, diff --git a/ffi/sokol/sokol_imgui.lua b/ffi/sokol/sokol_imgui.lua index 2e3cd91..5e4d2b0 100644 --- a/ffi/sokol/sokol_imgui.lua +++ b/ffi/sokol/sokol_imgui.lua @@ -4,7 +4,7 @@ local sokol_filename = _G.SOKOL_DLL or "sokol_imgui_dll" local libs = ffi_sokol_imgui or { OSX = { x64 = sokol_filename..".so" }, Windows = { x64 = sokol_filename..".dll" }, - Linux = { x64 = sokol_filename..".so", arm = sokol_filename..".so" }, + Linux = { x64 = "./bin/linux/lib"..sokol_filename..".so", arm = "./bin/linux/lib"..sokol_filename..".so" }, BSD = { x64 = sokol_filename..".so" }, POSIX = { x64 = sokol_filename..".so" }, Other = { x64 = sokol_filename..".so" }, diff --git a/ffi/sokol/sokol_libs.lua b/ffi/sokol/sokol_libs.lua index 02be80c..8abc23f 100644 --- a/ffi/sokol/sokol_libs.lua +++ b/ffi/sokol/sokol_libs.lua @@ -4,7 +4,7 @@ local sokol_filename = _G.SOKOL_DLL or "sokol_dll" local libs = ffi_sokol_libs or { OSX = { x64 = sokol_filename.."_macos.so", arm64 = sokol_filename.."_macos_arm64.so" }, Windows = { x64 = sokol_filename..".dll" }, - Linux = { x64 = sokol_filename..".so", arm = sokol_filename..".so" }, + Linux = { x64 = "./bin/linux/lib"..sokol_filename..".so", arm = "./bin/linux/lib"..sokol_filename..".so" }, BSD = { x64 = sokol_filename..".so" }, POSIX = { x64 = sokol_filename..".so" }, Other = { x64 = sokol_filename..".so" }, diff --git a/ffi/sokol/sokol_nuklear.lua b/ffi/sokol/sokol_nuklear.lua index 7baecd2..b987726 100644 --- a/ffi/sokol/sokol_nuklear.lua +++ b/ffi/sokol/sokol_nuklear.lua @@ -4,7 +4,7 @@ local sokol_filename = _G.SOKOL_DLL or "sokol_nuklear_dll" local libs = ffi_sokol_nuklear or { OSX = { x64 = sokol_filename..".so" }, Windows = { x64 = sokol_filename..".dll" }, - Linux = { x64 = sokol_filename..".so", arm = sokol_filename..".so" }, + Linux = { x64 = "./bin/linux/lib"..sokol_filename..".so", arm = "./bin/linux/lib"..sokol_filename..".so" }, BSD = { x64 = sokol_filename..".so" }, POSIX = { x64 = sokol_filename..".so" }, Other = { x64 = sokol_filename..".so" }, diff --git a/ffi/sokol/sokol_shape.lua b/ffi/sokol/sokol_shape.lua index 4caebe0..92409db 100644 --- a/ffi/sokol/sokol_shape.lua +++ b/ffi/sokol/sokol_shape.lua @@ -3,7 +3,7 @@ local ffi = require( "ffi" ) local libs = ffi_sokol_shape or { OSX = { x64 = "sokol_shape_dll.so" }, Windows = { x64 = "sokol_shape_dll.dll" }, - Linux = { x64 = "sokol_shape_dll.so", arm = "sokol_shape_dll.so" }, + Linux = { x64 = "./bin/linux/lib".."sokol_shape_dll.so", arm = "./bin/linux/lib".."sokol_shape_dll.so" }, BSD = { x64 = "sokol_shape_dll.so" }, POSIX = { x64 = "sokol_shape_dll.so" }, Other = { x64 = "sokol_shape_dll.so" }, diff --git a/ffi/sokol/stb.lua b/ffi/sokol/stb.lua index b52e3b3..a0851e3 100644 --- a/ffi/sokol/stb.lua +++ b/ffi/sokol/stb.lua @@ -3,7 +3,7 @@ local ffi = require( "ffi" ) local libs = ffi_stb_dll or { OSX = { x64 = "stb_dll" }, Windows = { x64 = "stb_dll.dll" }, - Linux = { x64 = "stb_dll.so", arm = "stb_dll.so" }, + Linux = { x64 = "./bin/linux/lib".."stb_dll.so", arm = "./bin/linux/lib".."stb_dll.so" }, BSD = { x64 = "stb_dll.so" }, POSIX = { x64 = "stb_dll.so" }, Other = { x64 = "stb_dll.so" }, diff --git a/run_sample.sh b/run_sample.sh old mode 100644 new mode 100755 index a08a2ce..8ee6ae0 --- a/run_sample.sh +++ b/run_sample.sh @@ -2,6 +2,7 @@ SCRIPT_PATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" PROJECT_PATH="$(dirname $(dirname "$SCRIPT_PATH"))" +OS=$(uname -s) if [[ "$OS" == "Linux"* ]]; then echo "Running Linux..."