From 8848e4f55561dbae8d76d27ed5e168b17c69e85d Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Wed, 18 Mar 2020 14:08:17 -0400
Subject: Shared library search improvement

* Define platform dependent SPM_SHLIB_EXTENSION
* rpath_libraries_available() uses SPM_SHLIB_EXTENSION
---
 include/shlib.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/shlib.h b/include/shlib.h
index e4d0d08..a0b6aeb 100644
--- a/include/shlib.h
+++ b/include/shlib.h
@@ -1,12 +1,18 @@
 #ifndef SPM_SHLIB_H
 #define SPM_SHLIB_H
 
-#ifdef __APPLE__
+#if defined(_MSC_VER)
+#define SPM_SHLIB_EXEC "dumpbin"
+#define SPM_SHLIB_EXEC_ARGS "/dependents"
+#define SPM_SHLIB_EXTENSION ".dll"
+#elif defined(__APPLE__) && defined(__MACH__)
 #define SPM_SHLIB_EXEC "/usr/bin/otool"
 #define SPM_SHLIB_EXEC_ARGS "-l"
-#else
+#define SPM_SHLIB_EXTENSION ".dylib"
+#else  // linux (hopefully)
 #define SPM_SHLIB_EXEC "/usr/bin/objdump"
 #define SPM_SHLIB_EXEC_ARGS "-p"
+#define SPM_SHLIB_EXTENSION ".so"
 #endif
 
 StrList *shlib_deps(const char *_filename);
-- 
cgit