diff options
author | gautier.hattenberger | 2015-01-07 14:36:00 +0000 |
---|---|---|
committer | gautier.hattenberger | 2015-01-07 14:36:00 +0000 |
commit | 63edf4eeb3b8063bf9541dbc611dde73abf4ca56 (patch) | |
tree | f7dcea082b0ca673dab3caafa09f67334f3ff1b7 /examples | |
parent | 5d51a16a065caa3cd74d7be4bc9a525d205d8746 (diff) | |
download | ivy-ocaml-63edf4eeb3b8063bf9541dbc611dde73abf4ca56.zip ivy-ocaml-63edf4eeb3b8063bf9541dbc611dde73abf4ca56.tar.gz ivy-ocaml-63edf4eeb3b8063bf9541dbc611dde73abf4ca56.tar.bz2 ivy-ocaml-63edf4eeb3b8063bf9541dbc611dde73abf4ca56.tar.xz |
fix ctkivy and add tk part to makefile again
Diffstat (limited to 'examples')
-rw-r--r-- | examples/Makefile | 18 | ||||
-rw-r--r-- | examples/tkivyprobe.ml | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/examples/Makefile b/examples/Makefile index d110fd0..a25375e 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,11 +1,11 @@ # $Id$ -OCAMLC = ocamlc -I .. -OCAMLMLI = ocamlc -I .. -OCAMLOPT = ocamlopt -OCAMLDEP=ocamldep +OCAMLC = ocamlfind ocamlc -I .. +OCAMLMLI = ocamlfind ocamlc -I .. +OCAMLOPT = ocamlfind ocamlopt +OCAMLDEP = ocamlfind ocamldep -all: ivyprobe.out glibivyprobe.out +all: ivyprobe.out glibivyprobe.out tkivyprobe.out ivyprobe.out : ivyprobe.cmo ivyivyprobe.cmo $(OCAMLC) -custom -o $@ unix.cma ivy-ocaml.cma $^ @@ -13,9 +13,11 @@ ivyprobe.out : ivyprobe.cmo ivyivyprobe.cmo glibivyprobe.out : ivyprobe.cmo glibivyprobe.cmo $(OCAMLC) -custom -o $@ unix.cma glibivy-ocaml.cma $^ -#tkivyprobe.out : ivyprobe.cmo tkivyprobe.cmo -# $(OCAMLC) -custom -o $@ unix.cma -I +labltk labltk.cma -I . $^ -#tkivyprobe.cmo : OCAMLFLAGS=-I +labltk +tkivyprobe.out : ivyprobe.cmo tkivyprobe.cmo + $(OCAMLC) -custom -o $@ unix.cma -I +labltk labltk.cma tkivy-ocaml.cma $^ + +tkivyprobe.cmo : tkivyprobe.ml + $(OCAMLC) -package unix,labltk -c $< %.cmo : %.ml $(OCAMLC) -c $< diff --git a/examples/tkivyprobe.ml b/examples/tkivyprobe.ml index 67ee3aa..150ccdb 100644 --- a/examples/tkivyprobe.ml +++ b/examples/tkivyprobe.ml @@ -1,6 +1,6 @@ let _ = Ivyprobe.init (); - let top = Tk.openTk () in + let _ = Tk.openTk () in try ignore (TkIvy.set_up_channel Unix.stdin Ivy.stop (fun _ -> Ivyprobe.read stdin)); TkIvy.main () |