Attachment #743835 for bug #769341

Lines 503-512 globals.cmi : \ Link Here

(-)a/src/.depend (-4 lines)
503	path.cmi \	503	path.cmi \
504	lwt/lwt.cmi \	504	lwt/lwt.cmi \
505	common.cmi	505	common.cmi
506	linkgtk.cmo : \
507	main.cmo
508	linkgtk.cmx : \
509	main.cmx
510	linkgtk2.cmo : \	506	linkgtk2.cmo : \
511	uigtk2.cmi \	507	uigtk2.cmi \
512	main.cmo	508	main.cmo




# User interface style:
#   Legal values are
#     UISTYLE=text
#     UISTYLE=gtk
#     UISTYLE=gtk2
#     UISTYLE=mac
#
# This should be set to an appropriate value automatically, depending
# on whether the lablgtk library is available
LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk3
##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well
## at the moment and we don't want to confuse people by building it by default

#    CFLAGS+=-cclib /subsystem:windows
#  endif

# Gtk GUI
ifeq ($(UISTYLE), gtk)
  CAMLFLAGS+=-I +lablgtk
  OCAMLOBJS+=pixmaps.cmo uigtk.cmo linkgtk.cmo
  OCAMLLIBS+=lablgtk.cma
endif

# Gtk2 GUI
OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null)


Lines 1-7 Link Here

(-)a/src/dune (-1 / +1 lines)
1	(library	1	(library
2	(name unison_lib)	2	(name unison_lib)
3	(wrapped false)	3	(wrapped false)
4	(modules :standard \ linktext linkgtk linkgtk2 uigtk2 uimacbridge uimacbridgenew test)	4	(modules :standard \ linktext linkgtk2 uigtk2 uimacbridge uimacbridgenew test)
5	(modules_without_implementation ui)	5	(modules_without_implementation ui)
6	(flags :standard	6	(flags :standard
7	-w -3-6-9-10-26-27-32-34-35-38-39-50-52	7	-w -3-6-9-10-26-27-32-34-35-38-39-50-52




(* Unison file synchronizer: src/linkgtk.ml *)
(* Copyright 1999-2020, Benjamin C. Pierce

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
*)


module TopLevel = Main.Body(Uigtk.Body)

Return to bug 769341

Lines 69-81 OCAMLLIBDIR=$(shell ocamlc -v \| tail -1 \| sed -e 's/.* //g' \| tr '\\' '/' \| tr - Link Here

(-)a/src/Makefile.OCaml (-9 lines)
69	# User interface style:	69	# User interface style:
70	# Legal values are	70	# Legal values are
71	# UISTYLE=text	71	# UISTYLE=text
72	# UISTYLE=gtk
73	# UISTYLE=gtk2	72	# UISTYLE=gtk2
74	# UISTYLE=mac	73	# UISTYLE=mac
75	#	74	#
76	# This should be set to an appropriate value automatically, depending	75	# This should be set to an appropriate value automatically, depending
77	# on whether the lablgtk library is available	76	# on whether the lablgtk library is available
78	LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
79	LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk3	77	LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk3
80	##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well	78	##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well
81	## at the moment and we don't want to confuse people by building it by default	79	## at the moment and we don't want to confuse people by building it by default
Lines 262-274 endif Link Here
262	# CFLAGS+=-cclib /subsystem:windows	260	# CFLAGS+=-cclib /subsystem:windows
263	# endif	261	# endif
264		262
265	# Gtk GUI
266	ifeq ($(UISTYLE), gtk)
267	CAMLFLAGS+=-I +lablgtk
268	OCAMLOBJS+=pixmaps.cmo uigtk.cmo linkgtk.cmo
269	OCAMLLIBS+=lablgtk.cma
270	endif
271
272	# Gtk2 GUI	263	# Gtk2 GUI
273	OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null)	264	OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null)
274		265

Lines 1-19 Link Here

(-)a/src/linkgtk.ml (-19 lines)
1	(* Unison file synchronizer: src/linkgtk.ml *)
2	(* Copyright 1999-2020, Benjamin C. Pierce
3
4	This program is free software: you can redistribute it and/or modify
5	it under the terms of the GNU General Public License as published by
6	the Free Software Foundation, either version 3 of the License, or
7	(at your option) any later version.
8
9	This program is distributed in the hope that it will be useful,
10	but WITHOUT ANY WARRANTY; without even the implied warranty of
11	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	GNU General Public License for more details.
13
14	You should have received a copy of the GNU General Public License
15	along with this program. If not, see <http://www.gnu.org/licenses/>.
16	*)
17
18
19	module TopLevel = Main.Body(Uigtk.Body)