Merge pull request #109 from alanshutko/update-mac-docs

Update for current Mac UI build. Fixes #47

2 files changed, 4 insertions, 38 deletions

diff --git a/doc/unison-manual.tex b/doc/unison-manual.tex
index df4a8a7..bffd9ba 100755
--- a/doc/unison-manual.tex
+++ b/doc/unison-manual.tex
@@ -51,7 +51,7 @@
   \LARGE%
   Version \unisonversion \\[4ex] %
   % \today %
-  \large Copyright 1998-2015, Benjamin C. Pierce
+  \large Copyright 1998-2015, 2017, Benjamin C. Pierce
   \end{center}%
 \fi%
 %
@@ -339,22 +339,9 @@ planning on building the GUI, just to make sure it works.
 
 To build the basic GUI version, you'll first need to download and install
 the XCode developer tools from Apple.  Once this is done, just type {\tt
-  make UISTYLE=macnew} in the {\tt src} directory, and if things go well you
+  make} in the {\tt src} directory, and if things go well you
 should get an application that you can move from {\tt
-  uimacnew/build/Default/Unison.app} to wherever you want it.
-
-There is also an experimental GUI with a somewhat smoother look and feel.
-To compile this one (once you've got the basic one working), proceed as
-follows:
-\begin{enumerate}
-\item Go to the {\tt uimacnew09} directory and double-click the file {\tt
-  BWToolkit.ibplugin}.
-\item Go back up to the {\tt src} directory and type {\tt make
-  UISTYLE=macnew09}.
-\item You should get an application built for you at {\tt
-  uimacnew09/build/Default/Unison.app}.
-\end{enumerate}
-
+  uimac14/build/Default/Unison.app} to wherever you want it.
 
 \SUBSUBSECTION{Windows}{build-win}
 
diff --git a/src/Makefile.OCaml b/src/Makefile.OCaml
index fabd9d8..ca9518a 100644
--- a/src/Makefile.OCaml
+++ b/src/Makefile.OCaml
@@ -69,9 +69,7 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.* //g' | tr '\\' '/' | tr -
 #     UISTYLE=text
 #     UISTYLE=gtk
 #     UISTYLE=gtk2
-#     UISTYLE=mac       (old and limited, but working)
-#     UISTYLE=macnew    (spiffier)
-#     UISTYLE=mac14  (even spiffier, but not yet extensively tested)
+#     UISTYLE=mac14
 #
 # This should be set to an appropriate value automatically, depending
 # on whether the lablgtk library is available
@@ -170,17 +168,12 @@ clean::
 ####################################################################
 ### Unison objects and libraries
 
-ifeq ($(UISTYLE),mac)
-  buildexecutable:: macexecutable
-  UIMACDIR=uimac
-else
 ifeq ($(UISTYLE),mac14)
   buildexecutable:: macexecutable
   UIMACDIR=uimac14
 else
   buildexecutable:: $(NAME)$(EXEC_EXT)
 endif
-endif
 
 MINOSXVERSION=10.5
 # XCODEFLAGS=-sdk macosx$(MINOSXVERSION)
@@ -245,19 +238,6 @@ ifeq ($(UISTYLE), text)
   OCAMLOBJS+=linktext.cmo
 endif
 
-## Old Mac UI
-ifeq ($(UISTYLE),mac)
-  OCAMLOBJS+=uimacbridge.cmo
-endif
-
-## New Mac UI
-ifeq ($(UISTYLE),macnew)
-  OCAMLOBJS+=uimacbridgenew.cmo
-  THREADS=true
-  OCAMLLIBS+=threads.cma
-  INCLFLAGS+=-thread
-endif
-
 ## New Mac UI, 2014 version
 ifeq ($(UISTYLE),mac14)
   OCAMLOBJS+=uimacbridgenew.cmo
@@ -481,4 +461,3 @@ clean::
 paths:
 	@echo PATH = $(PATH)
 	@echo OCAMLLIBDIR = $(OCAMLLIBDIR)
-