Commit dbd89a28 authored by Maximilien Colange's avatar Maximilien Colange

Merge branch 'packaging'

parents 258d14f8 7b2db400
......@@ -10,7 +10,7 @@ OCAMLBUILD=ocamlbuild -use-ocamlfind -classic-display -build-dir $(BUILDDIR) @OC
UTAP_INCLUDEDIR=@abs_top_srcdir@/utap/src
UTAP_LIB=@abs_top_srcdir@/utap/src/libutap.a
CXX_FLAGS=-std=c++11 -fPIC -O3 -g -DNDEBUG @TIAMO_MACROS@ -I$(UTAP_INCLUDEDIR) -I@abs_top_srcdir@/src
CXX_FLAGS=-xc++ -std=c++11 -fPIC -O3 -g -DNDEBUG @TIAMO_MACROS@ -I$(UTAP_INCLUDEDIR) -I@abs_top_srcdir@/src
OCAML_CXX_FLAGS=$(foreach i,$(CXX_FLAGS),-ccopt $i)
XML_LINK_FLAGS=$(foreach i,$(XML_LIBS),-cclib $i)
......
......@@ -9,7 +9,10 @@ Both libraries have been adapted by M. Colange (essentially to drop dependency o
INSTALLATION NOTES
Requires Batteries
Requires ocaml, batteries, ocamlbuild, camlp4 (you can obtain them through opam)
Requires libxml2 (for the parser).
Requires a C++11-compatible compiler.
Tested (and works fine) with gcc-4.7, gcc-4.8, gcc-4.9 and gcc-5 (5.3.0).
- install udbml (see github.com/osankur/udbml.git)
- install TiAMo
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment