From 567b793b17eb64fbf8d37375cd740dac73550bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Thu, 2 Jul 2020 22:49:01 +0000 Subject: [PATCH 1/3] Update BUILD_OSX.md --- BUILD_OSX.md | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/BUILD_OSX.md b/BUILD_OSX.md index b39aadb287..9b3316240c 100644 --- a/BUILD_OSX.md +++ b/BUILD_OSX.md @@ -1,6 +1,6 @@ # Build OSX -*Last Updated on April 30, 2019* +*Last Updated on July 3, 2020* Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only macOS specific instructions are found in this document. @@ -15,14 +15,21 @@ Please read the [general build guide](BUILD.md) for information on dependencies Download an install Python 3.6.6 or higher from [here](https://www.python.org/downloads/). Execute the `Update Shell Profile.command` script that is provided with the installer. +### npm + +Install npm via `brew install npm`, as it is needed for generating the included jsdocs. + +### OSX SDK + +You will need the OSX SDK for building. The easiest way to get this is to install Xcode from the App Store. + ### OpenSSL Assuming you've installed OpenSSL using the homebrew instructions above, you'll need to set OPENSSL_ROOT_DIR so CMake can find your installations. -For OpenSSL installed via homebrew, set OPENSSL_ROOT_DIR: +For OpenSSL installed via homebrew, set OPENSSL_ROOT_DIR via + `export OPENSSL_ROOT_DIR=/usr/local/opt/openssl` + or by appending `-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl` to cmake - export OPENSSL_ROOT_DIR=/usr/local/Cellar/openssl/1.0.2l - -Note that this uses the version from the homebrew formula at the time of this writing, and the version in the path will likely change. ### Xcode If Xcode is your editor of choice, you can ask CMake to generate Xcode project files instead of Unix Makefiles. @@ -34,3 +41,7 @@ If `cmake` complains about Python 3 being missing, you may need to update your C After running cmake, you will have the make files or Xcode project file necessary to build all of the components. Open the hifi.xcodeproj file, choose ALL_BUILD from the Product > Scheme menu (or target drop down), and click Run. If the build completes successfully, you will have built targets for all components located in the `build/${target_name}/Debug` directories. + +### make + +If you build with make rather than Xcode, you can append `-j4`for assigning more threads. The number indicates the number of threads, e.g. 4. From cdb770b4070c1317afda590260d7a4f301b24e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Fri, 3 Jul 2020 03:27:45 +0200 Subject: [PATCH 2/3] move npm into dependencies --- BUILD_OSX.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/BUILD_OSX.md b/BUILD_OSX.md index 9b3316240c..5384326b38 100644 --- a/BUILD_OSX.md +++ b/BUILD_OSX.md @@ -8,17 +8,13 @@ Please read the [general build guide](BUILD.md) for information on dependencies [Homebrew](https://brew.sh/) is an excellent package manager for macOS. It makes install of some Vircadia dependencies very simple. - brew install cmake openssl + brew install cmake openssl npm ### Python 3 Download an install Python 3.6.6 or higher from [here](https://www.python.org/downloads/). Execute the `Update Shell Profile.command` script that is provided with the installer. -### npm - -Install npm via `brew install npm`, as it is needed for generating the included jsdocs. - ### OSX SDK You will need the OSX SDK for building. The easiest way to get this is to install Xcode from the App Store. From 9d2785f4e5259e6a442ec03debbaeaf394035bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Tue, 7 Jul 2020 04:51:28 +0200 Subject: [PATCH 3/3] Update BUILD_OSX.md Co-authored-by: kasenvr <52365539+kasenvr@users.noreply.github.com> --- BUILD_OSX.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD_OSX.md b/BUILD_OSX.md index 5384326b38..ccf32d71a8 100644 --- a/BUILD_OSX.md +++ b/BUILD_OSX.md @@ -24,7 +24,7 @@ You will need the OSX SDK for building. The easiest way to get this is to instal Assuming you've installed OpenSSL using the homebrew instructions above, you'll need to set OPENSSL_ROOT_DIR so CMake can find your installations. For OpenSSL installed via homebrew, set OPENSSL_ROOT_DIR via `export OPENSSL_ROOT_DIR=/usr/local/opt/openssl` - or by appending `-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl` to cmake + or by appending `-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl` to `cmake` ### Xcode