diff options
| -rw-r--r-- | INSTALL.md | 20 | ||||
| -rw-r--r-- | lib/kernel/doc/src/inet.xml | 2 |
2 files changed, 13 insertions, 9 deletions
diff --git a/INSTALL.md b/INSTALL.md index 70d465831d..34dd9fed8e 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -708,23 +708,25 @@ the best possible performance, do like this: Install Xcode from the AppStore if it is not already installed. -For Xcode 4.3 you will also need to download "Command Line Tools" -via the Downloads preference pane i Xcode. +If you have Xcode 4.3, or later, you will also need to download +"Command Line Tools" via the Downloads preference pane in Xcode. Some tools may still be lacking or out-of-date, we recommend using [Homebrew](https://github.com/mxcl/homebrew/wiki/installation) or -Macports update those tools. +Macports to update those tools. Install MacPorts (<http://www.macports.org/>). Then: $ sudo port selfupdate $ sudo port install gcc45 +universal -If you want to build the `wx` application, get wxMac-2.8.12 +### Building with wxErlang ### + +If you want to build the `wx` application, you will need to get wxMac-2.8.12 (`wxMac-2.8.12.tar.gz` from -<http://sourceforge.net/projects/wxwindows/files/2.8.12/>) and build: +<http://sourceforge.net/projects/wxwindows/files/2.8.12/>) and install it. -Export the path for MacOSX10.6.sdk, +Export the path for MacOSX10.6.sdk: $ export SDK=/Developer/SDKs/MacOSX10.6.sdk @@ -732,18 +734,20 @@ In Xcode 4.3 the path has changed so use the following instead, $ export SDK=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk -Then configure and build wx, +Then configure and build wxMac: $ arch_flags="-arch i386" ./configure CFLAGS="$arch_flags" CXXFLAGS="$arch_flags" CPPFLAGS="$arch_flags" LDFLAGS="$arch_flags" OBJCFLAGS="$arch_flags" OBJCXXFLAGS="$arch_flags" --prefix=/usr/local --with-macosx-sdk="$SDK" --with-macosx-version-min=10.6 --enable-unicode --with-opengl --disable-shared $ make $ sudo make install -To link wx properly we will also need to build and install `wxStyledTextCtrl` +To link wx properly you will also need to build and install `wxStyledTextCtrl`: $ cd contrib/src/stc $ make $ sudo make install +### Finish up ### + Build Erlang with the MacPorts GCC as the main compiler (using `clang` for the Objective-C Cocoa code in the `wx` application): diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml index 096ddfd847..b727960d96 100644 --- a/lib/kernel/doc/src/inet.xml +++ b/lib/kernel/doc/src/inet.xml @@ -452,8 +452,8 @@ fe80::204:acff:fe17:bf38 Scans every byte in received data-packets and checks if the 8 bit is set in any of them. Information is retrieved with <c>inet:getopts/2</c>. - <note>Deprecated! Will be removed in Erlang/OTP R16.</note> </p> + <p>Note that the <c>bit8</c> option is deprecated and will be removed in Erlang/OTP R16.</p> </item> <tag><c>{broadcast, Boolean}</c>(UDP sockets)</tag> |