summaryrefslogtreecommitdiffstats
path: root/virtual-programs
diff options
context:
space:
mode:
authorOmar Rizwan <omar@omar.website>2024-03-19 19:22:28 +0000
committerOmar Rizwan <omar@omar.website>2024-03-19 19:22:28 +0000
commit3fc8f85c828d9dde9db826fdef8db0744ae674a3 (patch)
tree20aa77d569a5c5b57d43d0916ce45368c6ec699c /virtual-programs
parentfolk0: Stick with 720p for now (diff)
downloadfolk-3fc8f85c828d9dde9db826fdef8db0744ae674a3.tar.gz
folk-3fc8f85c828d9dde9db826fdef8db0744ae674a3.zip
Make loadlibLd, filter by architecture if multiple candidates
Fixes https://discord.com/channels/956758212152025098/956758650700046366/1202431317971570728
Diffstat (limited to 'virtual-programs')
-rw-r--r--virtual-programs/images.folk7
1 files changed, 5 insertions, 2 deletions
diff --git a/virtual-programs/images.folk b/virtual-programs/images.folk
index 1be51424..002760c0 100644
--- a/virtual-programs/images.folk
+++ b/virtual-programs/images.folk
@@ -23,10 +23,13 @@ namespace eval ::image {
}
set cc [c create]
- c loadlib [expr {$tcl_platform(os) eq "Darwin" ? "/opt/homebrew/lib/libjpeg.dylib" : [lindex [exec /usr/sbin/ldconfig -p | grep libjpeg] end]}]
- c loadlib [expr {$tcl_platform(os) eq "Darwin" ? "/opt/homebrew/lib/libpng.dylib" : [lindex [exec /usr/sbin/ldconfig -p | grep libpng] end]}]
if {$tcl_platform(os) eq "Darwin"} {
+ c loadlib "/opt/homebrew/lib/libjpeg.dylib"
+ c loadlib "/opt/homebrew/lib/libpng.dylib"
$cc cflags -I/opt/homebrew/include -L/opt/homebrew/lib
+ } else {
+ c loadlibLd libjpeg.so
+ c loadlibLd libpng
}
$cc cflags -ljpeg -lpng