diff options
| author | bcpierce00 <bcpierce00@users.noreply.github.com> | 2017-11-28 14:57:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-28 14:57:50 -0500 |
| commit | 764cdb821e231e8eb30e79b5f68e4ccf4fb2e09e (patch) | |
| tree | 42c97ef06c8f01f992fd359df7c755778a7ff7a8 /src | |
| parent | 3702cd67fcc44ff45e54da685a62f30529f68cf9 (diff) | |
| parent | 084932931da3baba34d9910b3eb4bf91911e77d3 (diff) | |
| download | unison-764cdb821e231e8eb30e79b5f68e4ccf4fb2e09e.zip unison-764cdb821e231e8eb30e79b5f68e4ccf4fb2e09e.tar.gz unison-764cdb821e231e8eb30e79b5f68e4ccf4fb2e09e.tar.bz2 | |
Merge pull request #109 from alanshutko/update-mac-docs
Update for current Mac UI build. Fixes #47
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.OCaml | 23 |
1 files changed, 1 insertions, 22 deletions
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) - |