diff options
-rw-r--r-- | README.cmake | 3 | ||||
-rw-r--r-- | README.macos | 42 | ||||
-rw-r--r-- | doc/README.qt | 6 |
3 files changed, 33 insertions, 18 deletions
diff --git a/README.cmake b/README.cmake index 14e1bde5d5..2061f8d527 100644 --- a/README.cmake +++ b/README.cmake @@ -58,6 +58,9 @@ Note 1: # http://public.kitware.com/Bug/view.php?id=13818 -DPYTHON_EXECUTABLE=c:/Python27/python + # Disable building an application bundle (Wireshark.app) on Mac OS X + -DENABLE_APPLICATION_BUNDLE=OFF + Note 2: After running cmake, you can always run "make help" to see a list of all possible make targets. 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: diff --git a/doc/README.qt b/doc/README.qt index 7baaef093a..22af202035 100644 --- a/doc/README.qt +++ b/doc/README.qt @@ -24,7 +24,7 @@ There are several ways of building qtshark: any desired build arguments (e.g. "-D CMAKE_BUILD_TYPE:STRING=Debug" or "-D ENABLE_GTK3:BOOL=OFF") and click the "Run CMake" button. When that completes select "Build → Open Build and Run Kit Selector..." and make - sure qtshark is selected. + sure wireshark is selected. 2) CMake: @@ -36,6 +36,10 @@ There are several ways of building qtshark: cmake make + Note that CMake builds an application bundle (Wireshark.app) on Mac OS X + by default. Use the option "-DENABLE_APPLICATION_BUNDLE=OFF" to create a + traditional UNIX/POSIX build. + 3) Autotools: Qt (--with-qt) is enabled by default. |