adjust for macosx with "brewed" libraries
This commit is contained in:
+1
-8
@@ -15,16 +15,9 @@
|
|||||||
(define test-file4 #f)
|
(define test-file4 #f)
|
||||||
(define test-file3-id 3)
|
(define test-file3-id 3)
|
||||||
(define test-file4-id 4)
|
(define test-file4-id 4)
|
||||||
(let ((os (system-type 'os)))
|
|
||||||
(when (eq? os 'unix)
|
|
||||||
(set! test-file3 (build-path tests "idyll.mp3"))
|
(set! test-file3 (build-path tests "idyll.mp3"))
|
||||||
(set! test-file4 (build-path tests "idyll.flac"))
|
(set! test-file4 (build-path tests "idyll.flac"))
|
||||||
)
|
|
||||||
(when (eq? os 'windows)
|
|
||||||
(set! test-file3 (build-path tests "idyll.mp3"))
|
|
||||||
(set! test-file4 (build-path tests "idyll.flac"))
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
;(define fmt (ao-mk-format 24 48000 2 'big-endian))
|
;(define fmt (ao-mk-format 24 48000 2 'big-endian))
|
||||||
;(define ao-h (ao-open-live #f fmt))
|
;(define ao-h (ao-open-live #f fmt))
|
||||||
|
|||||||
+6
-3
@@ -67,13 +67,16 @@
|
|||||||
(do-for-f))))))
|
(do-for-f))))))
|
||||||
|
|
||||||
|
|
||||||
(define (build-lib-path)
|
(define (build-lib-path p)
|
||||||
(soundlibs-directory))
|
(if (eq? (system-type 'os) 'macosx)
|
||||||
|
(let ((brew-lib "/opt/homebrew/lib"))
|
||||||
|
(cons (soundlibs-directory) (cons brew-lib p)))
|
||||||
|
(cons (soundlibs-directory) p)))
|
||||||
|
|
||||||
(define (get-lib* libs-to-try orig-libs versions)
|
(define (get-lib* libs-to-try orig-libs versions)
|
||||||
(let ((libs-path (cons (build-lib-path) (get-lib-search-dirs))))
|
|
||||||
(unless (soundlibs-available?)
|
(unless (soundlibs-available?)
|
||||||
(download-soundlibs))
|
(download-soundlibs))
|
||||||
|
(let ((libs-path (build-lib-path (get-lib-search-dirs))))
|
||||||
(if (null? libs-to-try)
|
(if (null? libs-to-try)
|
||||||
(begin
|
(begin
|
||||||
(displayln (format "Warning: Cannot find library, tried ~a in ~a" orig-libs libs-path))
|
(displayln (format "Warning: Cannot find library, tried ~a in ~a" orig-libs libs-path))
|
||||||
|
|||||||
Reference in New Issue
Block a user