Lines 69-91
OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.* //g' | tr '\\' '/' | tr -
Link Here
|
69 |
# User interface style: |
69 |
# User interface style: |
70 |
# Legal values are |
70 |
# Legal values are |
71 |
# UISTYLE=text |
71 |
# UISTYLE=text |
72 |
# UISTYLE=gtk2 |
72 |
# UISTYLE=gtk3 |
73 |
# UISTYLE=mac |
73 |
# UISTYLE=mac |
74 |
# |
74 |
# |
75 |
# This should be set to an appropriate value automatically, depending |
75 |
# This should be set to an appropriate value automatically, depending |
76 |
# on whether the lablgtk library is available |
76 |
# on whether the lablgtk library is available |
77 |
LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk3 |
77 |
LABLGTK3LIB=$(OCAMLLIBDIR)/lablgtk3 |
78 |
##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 |
79 |
## 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 |
80 |
ifeq ($(OSARCH),osx) |
80 |
ifeq ($(OSARCH),osx) |
81 |
UISTYLE=mac |
81 |
UISTYLE=mac |
82 |
else |
82 |
else |
83 |
ifeq ($(wildcard $(LABLGTK2LIB)),$(LABLGTK2LIB)) |
83 |
ifeq ($(wildcard $(LABLGTK3LIB)),$(LABLGTK3LIB)) |
84 |
UISTYLE=gtk2 |
84 |
UISTYLE=gtk3 |
85 |
else |
85 |
else |
86 |
LABLGTK2LIB=$(abspath $(OCAMLLIBDIR)/../lablgtk3) |
86 |
LABLGTK3LIB=$(abspath $(OCAMLLIBDIR)/../lablgtk3) |
87 |
ifeq ($(wildcard $(LABLGTK2LIB)),$(LABLGTK2LIB)) |
87 |
ifeq ($(wildcard $(LABLGTK3LIB)),$(LABLGTK3LIB)) |
88 |
UISTYLE=gtk2 |
88 |
UISTYLE=gtk3 |
89 |
else |
89 |
else |
90 |
UISTYLE=text |
90 |
UISTYLE=text |
91 |
endif |
91 |
endif |
Lines 260-275
endif
Link Here
|
260 |
# CFLAGS+=-cclib /subsystem:windows |
260 |
# CFLAGS+=-cclib /subsystem:windows |
261 |
# endif |
261 |
# endif |
262 |
|
262 |
|
263 |
# Gtk2 GUI |
263 |
# Gtk3 GUI |
264 |
OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null) |
264 |
OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null) |
265 |
|
265 |
|
266 |
ifeq ($(UISTYLE), gtk2) |
266 |
ifeq ($(UISTYLE), gtk3) |
267 |
ifndef OCAMLFIND |
267 |
ifndef OCAMLFIND |
268 |
CAMLFLAGS+=-I +lablgtk3 |
268 |
CAMLFLAGS+=-I +lablgtk3 |
269 |
else |
269 |
else |
270 |
CAMLFLAGS+=$(shell $(OCAMLFIND) query -i-format lablgtk3 ) |
270 |
CAMLFLAGS+=$(shell $(OCAMLFIND) query -i-format lablgtk3 ) |
271 |
endif |
271 |
endif |
272 |
OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo |
272 |
OCAMLOBJS+=pixmaps.cmo uigtk3.cmo linkgtk3.cmo |
273 |
OCAMLLIBS+=lablgtk3.cma |
273 |
OCAMLLIBS+=lablgtk3.cma |
274 |
endif |
274 |
endif |
275 |
|
275 |
|