aboutsummaryrefslogtreecommitdiffstats
path: root/README.macos
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-10-10 15:03:26 -0700
committerGerald Combs <gerald@wireshark.org>2014-10-10 22:05:10 +0000
commit5c5bf3b370b2d1e219d1297ea6d36055be2cd8e4 (patch)
treecc9cb6a9780021e18e5342dca1b1804a0fb702bb /README.macos
parentffa377b22f1b686b1cd0908a8b19cda13c556c39 (diff)
Update READMEs to reflect recent CMake environment changes.
Change-Id: Idbf879f20448eea0b69e793271439dec877832e9 Reviewed-on: https://code.wireshark.org/review/4602 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'README.macos')
-rw-r--r--README.macos42
1 files changed, 25 insertions, 17 deletions
diff --git a/README.macos b/README.macos
index 5bd33a149e..5dd149b13c 100644
--- a/README.macos
+++ b/README.macos
@@ -13,26 +13,34 @@ for details. For Xcode 4, you will need to install the command-line
tools; select Preferences from the Xcode menu, select Downloads in the
Preferences window, and install Command Line Tools.
-You must have X11 and the X11 developer headers and libraries installed;
-otherwise, you will not be able to build or install GTK+, and will only
-be able to build TShark. The X11 and X11 SDK that come with Mac OS X
-releases for releases from Panther to Lion can be used to build and run
-Wireshark. Mountain Lion does not include X11; you should install X11
-from elsewhere, such as
+You must have Qt installed. You can download precompiled Qt packages and
+source code from
- http://xquartz.macosforge.org/
+ https://www.qt.io/download-open-source/
+
+or use the macosx-setup.sh script described below.
You must also have GLib and, if you want to build Wireshark as well as
-TShark, GTK+. The macosx-setup.sh script can be used to download, patch
-as necessary, build, and install those libraries and the libraries on
-which they depend; it will, by default, also install other libraries
-that can be used by Wireshark and TShark. The versions of libraries to
-download are specified by variables set early in the script; you can
-comment out the settings of optional libraries if you don't want them
-downloaded and installed. Before running the macosx-setup.sh script,
-and before attempting to build Wireshark, make sure your PKG_CONFIG_PATH
-environment variable's setting includes both /usr/X11/lib/pkgconfig
-and /usr/local/lib/pkgconfig.
+TShark. The macosx-setup.sh script can be used to download, patch as
+necessary, build, and install those libraries and the libraries on which
+they depend; it will, by default, also install other libraries that can
+be used by Wireshark and TShark. The versions of libraries to download
+are specified by variables set early in the script; you can comment out
+the settings of optional libraries if you don't want them downloaded and
+installed. Before running the macosx-setup.sh script, and before
+attempting to build Wireshark, make sure your PKG_CONFIG_PATH
+environment variable's setting includes both /usr/X11/lib/pkgconfig and
+/usr/local/lib/pkgconfig.
+
+If you wish to build the legacy (GTK+) UI you must have X11 and the X11
+developer headers and libraries installed; otherwise, you will not be
+able to build or install GTK+. The X11 and X11 SDK that come with Mac
+OS X releases for releases from Panther to Lion can be used to build and
+run Wireshark. Mountain Lion does not include X11; you should install
+X11 from elsewhere, such as
+
+ http://xquartz.macosforge.org/
+
After you have installed those libraries: