Various cleanups

[builder.git] / source / architecture.cpp

diff --git a/source/architecture.cpp b/source/architecture.cpp
index 7faefeb456f3953548084782c63079fc466a59fc..07f5dbfb0c09159e7fa4fcbb14e7d9e3e6ff03af 100644 (file)
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -41,12 +41,15 @@ const char *systems[] =
 {
        "linux",
        "freebsd",
+       "darwin",
        "windows",
+       "android",
        0
 };
 
 const char *aliases[] =
 {
+       "x86",   "pc",
        "i586",  "pentium",
        "i686",  "pentiumpro",
        "x86_64", "athlon64",
@@ -116,7 +119,10 @@ Architecture::Architecture(Builder &b, const string &spec):
        }
        else
        {
-               sharedlib_patterns.push_back(Pattern("lib%.so"));
+               if(system=="darwin")
+                       sharedlib_patterns.push_back(Pattern("lib%.dylib"));
+               else
+                       sharedlib_patterns.push_back(Pattern("lib%.so"));
                staticlib_patterns.push_back(Pattern("lib%.a"));
                executable_patterns.push_back(Pattern("%"));
        }