diff --git a/README.md b/README.md index 9bd2d30..9c944f1 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,9 @@ fixes dependencies where bundled libraries depend on each other. If this option `-i`, `--ignore` (path) > Dylibs in (path) will be ignored. By default, dylibbundler will ignore libraries installed in `/usr/lib` since they are assumed to be present by default on all OS X installations.*(It is usually recommend not to install additional stuff in `/usr/`, always use ` /usr/local/` or another prefix to avoid confusion between system libs and libs you added yourself)* +`-bs`, `--bundle-system-libs` +> By default, dylibbundler will ignore libraries installed in `/usr/lib` and `/System/Library`, this disables that default and searches both. + `-d`, `--dest-dir` (directory) > Sets the name of the directory in which distribution-ready dylibs will be placed, relative to the current working directory. (Default is `./libs`) For an app bundle, it is often convenient to set it to something like `./MyApp.app/Contents/libs`. diff --git a/src/Dependency.cpp b/src/Dependency.cpp index f67d06d..c71eba7 100644 --- a/src/Dependency.cpp +++ b/src/Dependency.cpp @@ -130,6 +130,7 @@ Dependency::Dependency(std::string path, const std::string& dependent_file) for( int i=0; i" << std::endl; std::cout << "-b, --bundle-deps" << std::endl; + std::cout << "-bs, --bundle-system-libs" << std::endl; std::cout << "-d, --dest-dir " << std::endl; std::cout << "-p, --install-path <'inner' path of bundled libraries (usually relative to executable, by default '@executable_path/../libs/')>" << std::endl; std::cout << "-s, --search-path " << std::endl; @@ -84,6 +85,11 @@ int main (int argc, char * const argv[]) Settings::bundleLibs(true); continue; } + else if(strcmp(argv[i],"-bs")==0 or strcmp(argv[i],"--bundle-system-libs")==0) + { + Settings::searchSystemLib(true); + continue; + } else if(strcmp(argv[i],"-p")==0 or strcmp(argv[i],"--install-path")==0) { i++; @@ -126,7 +132,7 @@ int main (int argc, char * const argv[]) else if(strcmp(argv[i],"-h")==0 or strcmp(argv[i],"--help")==0) { showHelp(); - exit(0); + exit(0); } if(strcmp(argv[i],"-s")==0 or strcmp(argv[i],"--search-path")==0) { @@ -134,6 +140,11 @@ int main (int argc, char * const argv[]) Settings::addSearchPath(argv[i]); continue; } + if(strcmp(argv[i],"-v")==0 or strcmp(argv[i],"--version")==0) + { + std::cout << VERSION << std::endl; + exit(0); + } else if(i>0) { // if we meet an unknown flag, abort