Skip to content
Snippets Groups Projects
Commit 66bc89f6 authored by Bienchen's avatar Bienchen
Browse files

Updated "MacOS X" strings to "macOS"

parent c27b9250
No related branches found
No related tags found
No related merge requests found
# this file contains a list of settings to be used on MacOS X with # this file contains a list of settings to be used on macOS with
# the dependencies installed over MacPorts # the dependencies installed over MacPorts
set(BOOST_ROOT "/opt/local" CACHE PATH "prefix for the boost") set(BOOST_ROOT "/opt/local" CACHE PATH "prefix for the boost")
set(PYTHON_ROOT "/opt/local" CACHE PATH "prefix for python") set(PYTHON_ROOT "/opt/local" CACHE PATH "prefix for python")
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Check for Python Libraries # Check for Python Libraries
# #
# PYTHON_IGNORE_FRAMEWORKS if set, do not check for python frameworks. # PYTHON_IGNORE_FRAMEWORKS if set, do not check for python frameworks.
# has meaning on MacOS X only # has meaning on macOS only
# PYTHON_ROOT Prefix for python libraries # PYTHON_ROOT Prefix for python libraries
# PYTHON_MIN_VERSION minimal python version required # PYTHON_MIN_VERSION minimal python version required
# #
......
""" """
deploy.py helps you package your code into a standalone application. deploy.py helps you package your code into a standalone application.
for now, MacOS X and Linux are supported... for now, macOS and Linux are supported...
""" """
import os import os
import subprocess import subprocess
......
...@@ -122,7 +122,7 @@ to CMake with via `-D<opt>=<value>`. ...@@ -122,7 +122,7 @@ to CMake with via `-D<opt>=<value>`.
Flag to choose build generator Flag to choose build generator
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
CMake supports different build generators. On UNIX, i.e. MacOS X and Linux, the CMake supports different build generators. On UNIX, i.e. macOS and Linux, the
default build generator is Makefiles, but it is also possible to use other default build generator is Makefiles, but it is also possible to use other
programs. For a list of supported build generators on your platform, start cmake programs. For a list of supported build generators on your platform, start cmake
without parameters. without parameters.
...@@ -339,7 +339,7 @@ to run multiple jobs at once. ...@@ -339,7 +339,7 @@ to run multiple jobs at once.
What's next? What's next?
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
On Linux and MacOS X, you can start dng from the command-line. The binaries are all located in stage/bin: On Linux and macOS, you can start dng from the command-line. The binaries are all located in stage/bin:
.. code-block:: bash .. code-block:: bash
......
...@@ -30,7 +30,7 @@ The files we will be using in the tutorial are available in the examples ...@@ -30,7 +30,7 @@ The files we will be using in the tutorial are available in the examples
directory that comes with OpenStructure. Depending on your platform, the directory that comes with OpenStructure. Depending on your platform, the
examples are located at a different location: examples are located at a different location:
* on *MacOS X* the files are located inside the application bundle (DNG.app). * on *macOS* the files are located inside the application bundle (DNG.app).
The file browser will automatically point to the examples. The file browser will automatically point to the examples.
* on *Linux* the files are located at PREFIX/share/openstructure/examples, * on *Linux* the files are located at PREFIX/share/openstructure/examples,
where PREFIX is the path to the directory containing OpenStructure. where PREFIX is the path to the directory containing OpenStructure.
...@@ -41,7 +41,7 @@ Starting DNG ...@@ -41,7 +41,7 @@ Starting DNG
The graphical user interface of OpenStructure is called DNG (Dino/DeepView Next The graphical user interface of OpenStructure is called DNG (Dino/DeepView Next
Generation). To start it, Generation). To start it,
* on *MacOS X* double click DNG.app * on *macOS* double click DNG.app
* on *Linux* fire up a terminal change into the OpenStructure installation * on *Linux* fire up a terminal change into the OpenStructure installation
directory and type 'bin/dng'. If you have the binary directory in the PATH, directory and type 'bin/dng'. If you have the binary directory in the PATH,
typing *dng* is sufficient. typing *dng* is sufficient.
......
...@@ -117,7 +117,7 @@ The line containing the `DEPENDS_ON` directive lists all the modules on which ...@@ -117,7 +117,7 @@ The line containing the `DEPENDS_ON` directive lists all the modules on which
the new module depends (in this case :mod:`mol` and :mod:`ost.mol.alg`). The the new module depends (in this case :mod:`mol` and :mod:`ost.mol.alg`). The
`module` macro will take care of staging the headers, in this case into `module` macro will take care of staging the headers, in this case into
`ost/mod` and compiling, linking and staging of a library with the name `ost/mod` and compiling, linking and staging of a library with the name
`libost_mod.so` (`libost_gmod.dylib` on MacOS X). `libost_mod.so` (`libost_gmod.dylib` on macOS).
.. note:: .. note::
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include <ost/gfx/gl_include.hh> #include <ost/gfx/gl_include.hh>
#if defined(__APPLE__) #if defined(__APPLE__)
// On all MacOS X version we support, OpenGL 2.0 is available, so it's safe to // On all macOS version we support, OpenGL 2.0 is available, so it's safe to
// hardcode the value here... // hardcode the value here...
//same for windows vista and above, XP only has 1.1 //same for windows vista and above, XP only has 1.1
#define OST_GL_VERSION_2_0 1 #define OST_GL_VERSION_2_0 1
......
...@@ -25,7 +25,7 @@ The example `Write a Tool in Python` demonstrates how to add a simple tool ...@@ -25,7 +25,7 @@ The example `Write a Tool in Python` demonstrates how to add a simple tool
input_events Input Events input_events Input Events
Tools receive input events when the Control key (Command on MacOS X) is Tools receive input events when the Control key (Command on macOS) is
pressed. This includes both keyboard events and mouse events such as mouse pressed. This includes both keyboard events and mouse events such as mouse
move events, clicks and Real clicks. move events, clicks and Real clicks.
......
...@@ -111,7 +111,7 @@ def AddMenuAction(*args, **kwargs): ...@@ -111,7 +111,7 @@ def AddMenuAction(*args, **kwargs):
AddMenuAction('Scene', 'Background Color', SetBackgroundColor, AddMenuAction('Scene', 'Background Color', SetBackgroundColor,
shortcut='Ctrl+B') shortcut='Ctrl+B')
Whenever you press Ctrl+B (Cmd+B on MacOS X), the action will be executed. Whenever you press Ctrl+B (Cmd+B on macOS), the action will be executed.
Very often menu actions are coupled to the current selected objects in the Very often menu actions are coupled to the current selected objects in the
scene menu. These menu actions are either enabled or disabled depending on the scene menu. These menu actions are either enabled or disabled depending on the
......
...@@ -47,7 +47,7 @@ class GLCanvas; ...@@ -47,7 +47,7 @@ class GLCanvas;
/// ///
/// \section input_events Input Events /// \section input_events Input Events
/// ///
/// Tools receive input events when the Control key (Command on MacOS X) is /// Tools receive input events when the Control key (Command on macOS) is
/// pressed. This includes both keyboard events and mouse events such as mouse /// pressed. This includes both keyboard events and mouse events such as mouse
/// move events, clicks and Real clicks. /// move events, clicks and Real clicks.
/// ///
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment