From 159f6157bf15ddc19d133b5e926c02e88489f837 Mon Sep 17 00:00:00 2001 From: Fumiya Funatsu Date: Tue, 6 May 2025 09:04:36 +0900 Subject: [PATCH] fix: macos path and dll problem (partially) --- bin/macos/libhmm_dll_macos.so | Bin 32848 -> 25024 bytes bin/macos/libhmm_dll_macos_arm64.so | Bin 33272 -> 37696 bytes ffi/sokol/hmm.lua | 2 +- ffi/sokol/sokol_app.lua | 3 +-- ffi/sokol/sokol_gfx.lua | 2 +- ffi/sokol/sokol_gp.lua | 2 +- ffi/sokol/sokol_libs.lua | 2 +- projects/examples/run_sample.sh | 18 ++++++++++++------ tools/vfs/dirtools.lua | 2 ++ 9 files changed, 19 insertions(+), 12 deletions(-) mode change 100644 => 100755 bin/macos/libhmm_dll_macos.so mode change 100644 => 100755 bin/macos/libhmm_dll_macos_arm64.so mode change 100644 => 100755 projects/examples/run_sample.sh diff --git a/bin/macos/libhmm_dll_macos.so b/bin/macos/libhmm_dll_macos.so old mode 100644 new mode 100755 index d01a1257f0499795411beeec9848d28c8c5ec20a..3635b97c104b84050e6a23edce1966df2bfbd499 GIT binary patch literal 25024 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 literal 32848 zcmeI*&1w@-6u|MDw0=Of2yPTzWF=@Jqt-=SC==6ai=kB-q`PZArtN5wD>Df;uCnnR z+~{ivzJUwzH3V@jx+tELnK7}A*|-t@Ixed!6Ub&Y3D8+PiuLD=1K)=tlNTGoz=Z%jUIPOEfZYZBI0 z*Eb%nuB>Nf!*sQu)@lDy+SUDJRyuT6q9k!aVsgCbHNvjf4jX%&j%~Huwo`AqxEMQG zr{$JBzR{B#Cf6^g{gU+c47zvCxh8!rTI=|NM79@c{&Tq`8T3Avhs!_Sf4Y17UG!n` z``3?yn=)3ANX{gu%rB1G`b;H8V6$6m!XUA?%I4R}w2C=OjW_R7hWT%Y89D)sNY3$mm9%)F2L^{Dr%;-X-B z^6`9{e{V9s`65T0nZMj`g|6mYyW#ey-(hlvB(X#x}WP3*>&cvFaK8lyso*lRJ@U1bVb(c^Y(|y zdw4bN>w8H-009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL zKmY**5I_I{1Q0*~0R#|0009ILKmY**5J2EK3i!wI(3}|o1Q0*~0R#|0009ILKmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0 k009ILKmdXNOrRk9(QkHZXi2`!p0r2bWlx$j{}$5OUn7CJ1poj5 diff --git a/bin/macos/libhmm_dll_macos_arm64.so b/bin/macos/libhmm_dll_macos_arm64.so old mode 100644 new mode 100755 index 20887dc7d1b45ea8b33a5ffa223cd3dda0430528..d4c4ad643340a953e1f740ff6b5894c856568490 GIT binary patch literal 37696 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 diff --git a/ffi/sokol/hmm.lua b/ffi/sokol/hmm.lua index eea4d20..4142766 100644 --- a/ffi/sokol/hmm.lua +++ b/ffi/sokol/hmm.lua @@ -1,7 +1,7 @@ local ffi = require( "ffi" ) local libs = ffi_hmm_dll or { - OSX = { x64 = "hmm_dll" }, + 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" }, BSD = { x64 = "hmm_dll.so" }, diff --git a/ffi/sokol/sokol_app.lua b/ffi/sokol/sokol_app.lua index af453b6..d905ca9 100644 --- a/ffi/sokol/sokol_app.lua +++ b/ffi/sokol/sokol_app.lua @@ -4,7 +4,7 @@ local ffi = require( "ffi" ) local sokol_filename = _G.SOKOL_DLL or "sokol_dll" local libs = ffi_sokol_app or { - OSX = { x64 = sokol_filename..".so" }, + 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" }, BSD = { x64 = sokol_filename..".so" }, @@ -13,7 +13,6 @@ local libs = ffi_sokol_app or { } local lib = ffi_sokol_app or libs[ ffi.os ][ ffi.arch ] -print(lib) local sokol_app = ffi.load( lib ) -- just use LuaJIT ffi and lcpp together diff --git a/ffi/sokol/sokol_gfx.lua b/ffi/sokol/sokol_gfx.lua index 1d700c2..091b9b1 100644 --- a/ffi/sokol/sokol_gfx.lua +++ b/ffi/sokol/sokol_gfx.lua @@ -2,7 +2,7 @@ local ffi = require( "ffi" ) local sokol_filename = _G.SOKOL_DLL or "sokol_dll" local libs = ffi_sokol_gfx or { - OSX = { x64 = sokol_filename..".so" }, + 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" }, BSD = { x64 = sokol_filename..".so" }, diff --git a/ffi/sokol/sokol_gp.lua b/ffi/sokol/sokol_gp.lua index 4b50712..a777cf0 100644 --- a/ffi/sokol/sokol_gp.lua +++ b/ffi/sokol/sokol_gp.lua @@ -2,7 +2,7 @@ local ffi = require( "ffi" ) local sokol_filename = _G.SOKOL_GP_DLL or "sokol_gp_dll" local libs = ffi_sokol_gfx or { - OSX = { x64 = sokol_filename..".so" }, + 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" }, BSD = { x64 = sokol_filename..".so" }, diff --git a/ffi/sokol/sokol_libs.lua b/ffi/sokol/sokol_libs.lua index bfdeac1..02be80c 100644 --- a/ffi/sokol/sokol_libs.lua +++ b/ffi/sokol/sokol_libs.lua @@ -2,7 +2,7 @@ local ffi = require( "ffi" ) local sokol_filename = _G.SOKOL_DLL or "sokol_dll" local libs = ffi_sokol_libs or { - OSX = { x64 = sokol_filename..".so" }, + 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" }, BSD = { x64 = sokol_filename..".so" }, diff --git a/projects/examples/run_sample.sh b/projects/examples/run_sample.sh old mode 100644 new mode 100755 index f9ee580..f1fea39 --- a/projects/examples/run_sample.sh +++ b/projects/examples/run_sample.sh @@ -1,15 +1,21 @@ #!/bin/bash + +SCRIPT_PATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" +PROJECT_PATH="$(dirname $(dirname "$SCRIPT_PATH"))" + if [[ "$OSTYPE" == "linux-gnu"* ]]; then echo "Running Linux..." -export LD_LIBRARY_PATH=../bin/linux/ -../bin/linux/luajit ./samples/$1.lua +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PROJECT_PATH/bin/linux" +$PROJECT_PATH/bin/linux/luajit $SCRIPT_PATH/samples/$1.lua elif [[ "$OSTYPE" == "darwin"* ]]; then -echo "Running MaxOS..." -../bin/macos/luajit ./samples/$1.lua +echo "Running MacOS..." +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PROJECT_PATH/bin/macos" +export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PROJECT_PATH/bin/macos" +$PROJECT_PATH/bin/macos/luajit $SCRIPT_PATH/samples/$1.lua elif [[ "$OSTYPE" == "win32" ]]; then echo "Running Windows..." -LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../bin/linux -../bin/win64/luajit ./samples/$1.lua +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PROJECT_PATH/bin/linux +$PROJECT_PATH/bin/win64/luajit $SCRIPT_PATH/samples/$1.lua else echo "OS Type not found." fi diff --git a/tools/vfs/dirtools.lua b/tools/vfs/dirtools.lua index 0747ba7..0882d46 100644 --- a/tools/vfs/dirtools.lua +++ b/tools/vfs/dirtools.lua @@ -54,11 +54,13 @@ dirtools.add_default_paths = function(path) ["Linux"] = "linux", ["Windows"] = "win64", ["MacOSX"] = "macos", + ["OSX"] = "macos", } local extensions = { ["Linux"] = "so", ["Windows"] = "dll", ["MacOSX"] = "so", + ["OSX"] = "so", } package.cpath = package.cpath..";"..path.."bin/"..folders[ffi.os].."/?."..extensions[ffi.os]