Skip to content

Commit

Permalink
Updating Platform.MacOSX, Platform.Posix: Don't use .a files
Browse files Browse the repository at this point in the history
  • Loading branch information
metadings committed Sep 17, 2017
1 parent 9ddb84a commit 3b87b5d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 25 deletions.
17 changes: 0 additions & 17 deletions lib/Platform.MacOSX.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,15 @@ public static class MacOSX

// public const string LibraryFileExtension = ".dylib";

// TODO: is the redundancy here really necessary? Why look for .a files, which are static libraries? Why look for .so files? are they used at all on Mac OS X?
public static readonly string[] LibraryPaths = new string[] {
"{AppBase}/{Arch}/{Compiler}/{LibraryName}.dylib",
"{AppBase}/{Arch}/{Compiler}/{LibraryName}.dylib.*",
"{AppBase}/{Arch}/{Compiler}/{LibraryName}.a",
"{AppBase}/{Arch}/{Compiler}/{LibraryName}.a.*",
"{AppBase}/{Arch}/{Compiler}/{LibraryName}.so",
"{AppBase}/{Arch}/{Compiler}/{LibraryName}.so.*",
"{AppBase}/{Arch}/{LibraryName}.dylib",
"{AppBase}/{Arch}/{LibraryName}.dylib.*",
"{AppBase}/{Arch}/{LibraryName}.a",
"{AppBase}/{Arch}/{LibraryName}.a.*",
"{AppBase}/{Arch}/{LibraryName}.so",
"{AppBase}/{Arch}/{LibraryName}.so.*",
"{Path}/{LibraryName}.dylib",
"{Path}/{LibraryName}.dylib.*",
"{Path}/{LibraryName}.a",
"{Path}/{LibraryName}.a.*",
"{Path}/{LibraryName}.so",
"{Path}/{LibraryName}.so.*",
"{DllPath}/{LibraryName}.dylib",
"{DllPath}/{LibraryName}.dylib.*",
"{LibraryName}.dylib",
"@rpath/{LibraryName}.dylib",
"/usr/local/lib/{LibraryName}.dylib", // DEBUG: remove this again
"/opt/local/lib/{LibraryName}.dylib", // DEBUG: remove this again
};

}
Expand Down
8 changes: 0 additions & 8 deletions lib/Platform.Posix.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,12 @@ public static class Posix
// public const string LibraryFileExtension = ".so";

public static readonly string[] LibraryPaths = new string[] {
"{AppBase}/{Arch}/{Compiler}/{LibraryName}.a",
"{AppBase}/{Arch}/{Compiler}/{LibraryName}.a.*",
"{AppBase}/{Arch}/{Compiler}/{LibraryName}.so",
"{AppBase}/{Arch}/{Compiler}/{LibraryName}.so.*",
"{AppBase}/{Arch}/{LibraryName}.a",
"{AppBase}/{Arch}/{LibraryName}.a.*",
"{AppBase}/{Arch}/{LibraryName}.so",
"{AppBase}/{Arch}/{LibraryName}.so.*",
"{DllPath}/{Arch}/{LibraryName}.a",
"{DllPath}/{Arch}/{LibraryName}.a.*",
"{DllPath}/{Arch}/{LibraryName}.so",
"{DllPath}/{Arch}/{LibraryName}.so.*",
"{Path}/{LibraryName}.a",
"{Path}/{LibraryName}.a.*",
"{Path}/{LibraryName}.so",
"{Path}/{LibraryName}.so.*",
};
Expand Down

0 comments on commit 3b87b5d

Please sign in to comment.