mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-06-05 15:30:08 +08:00
fixed xml-light include path
This commit is contained in:
@@ -23,8 +23,8 @@
|
||||
# Quiet compilation
|
||||
Q=@
|
||||
|
||||
OCAMLC=ocamlc -thread
|
||||
OCAMLOPT=ocamlopt -thread
|
||||
OCAMLC=ocamlc -thread -I +xml-light
|
||||
OCAMLOPT=ocamlopt -thread -I +xml-light
|
||||
INCLUDES=-I +lablgtk2 -I ../../lib/ocaml
|
||||
LIBS=glibivy-ocaml.cma lablgtk.cma lib-pprz.cma lablgnomecanvas.cma xlib-pprz.cma
|
||||
CMXA=$(LIBS:.cma=.cmxa)
|
||||
|
||||
@@ -35,7 +35,7 @@ clean:
|
||||
OCAMLC = ocamlc
|
||||
OCAMLOPT = ocamlopt
|
||||
OCAMLLIB = ../../lib/ocaml
|
||||
INCLUDES= -I $(OCAMLLIB) -I ../multimon -I +lablgtk2
|
||||
INCLUDES= -I $(OCAMLLIB) -I ../multimon -I +lablgtk2 -I +xml-light
|
||||
LIBPPRZCMA=$(OCAMLLIB)/lib-pprz.cma
|
||||
|
||||
$(VAR)/boa.conf :$(CONF)/boa.conf
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
OCAMLOPT0 = ocamlopt
|
||||
OCAMLC = ocamlc
|
||||
OCAMLC = ocamlc -I +xml-light
|
||||
|
||||
MLFLAGS = -I +lablgtk2 -I +lablGL -I +camlimages -I ../../lib/ocaml
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ include ../../../conf/Makefile.local
|
||||
|
||||
all: wind
|
||||
|
||||
INCLUDES= -I ../../lib/ocaml -I +lablgtk2
|
||||
INCLUDES= -I ../../lib/ocaml -I +lablgtk2 -I +xml-light
|
||||
|
||||
OCAMLC= ocamlc $(INCLUDES)
|
||||
OCAMLMLI= ocamlc $(INCLUDES)
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
|
||||
Q=@
|
||||
|
||||
INCLUDES=
|
||||
XINCLUDES= -I +lablgl -I +lablgtk2
|
||||
INCLUDES= -I +xml-light
|
||||
XINCLUDES= -I +lablgl -I +lablgtk2 -I +xml-light
|
||||
OCAMLC=ocamlc $(INCLUDES)
|
||||
OCAMLOPT=ocamlopt $(INCLUDES)
|
||||
|
||||
@@ -44,7 +44,7 @@ opt : all lib-pprz.cmxa xlib-pprz.cmxa
|
||||
|
||||
lib-pprz.cma : $(CMO)
|
||||
@echo OL $@
|
||||
$(Q)ocamlmklib -o lib-pprz str.cma unix.cma xml-light.cma $^
|
||||
$(Q)ocamlmklib -I +xml-light -o lib-pprz str.cma unix.cma xml-light.cma $^
|
||||
|
||||
lib-pprz.cmxa : $(CMX)
|
||||
@echo OOL $@
|
||||
@@ -52,11 +52,11 @@ lib-pprz.cmxa : $(CMX)
|
||||
|
||||
xlib-pprz.cma : $(XCMO)
|
||||
@echo OL $@
|
||||
$(Q)ocamlmklib -o xlib-pprz $^
|
||||
$(Q)ocamlmklib -I +xml-light -o xlib-pprz $^
|
||||
|
||||
xlib-pprz.cmxa : $(XCMX)
|
||||
@echo OOL $@
|
||||
$(Q)ocamlmklib -o xlib-pprz $^
|
||||
$(Q)ocamlmklib -I +xml-light -o xlib-pprz $^
|
||||
|
||||
xml_get.out : lib-pprz.cma xml_get.cmo
|
||||
@echo OL $@
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
# Boston, MA 02111-1307, USA.
|
||||
#
|
||||
|
||||
OCAMLC = ocamlc
|
||||
OCAMLC = ocamlc -I +xml-light
|
||||
OCAMLOPT = ocamlopt
|
||||
|
||||
all: play
|
||||
@@ -32,4 +32,4 @@ play : play.ml
|
||||
$(OCAMLC) -custom -o $@ unix.cma glibivy-ocaml.cma -I +lablgtk2 -I ../lib/ocaml lablgtk.cma lib-pprz.cma gtkInit.cmo $^
|
||||
|
||||
plot_adc : plot_adc.c
|
||||
gcc -Wall `pkg-config gtk+-2.0 --cflags` -o plot_adc plot_adc.c `pkg-config gtk+-2.0 --libs` -lgtkdatabox -lglibivy -lpcre
|
||||
gcc -Wall `pkg-config gtk+-2.0 --cflags` -o plot_adc plot_adc.c `pkg-config gtk+-2.0 --libs` -lgtkdatabox -lglibivy -lpcre
|
||||
|
||||
@@ -32,8 +32,8 @@ SIMSCMO=$(SIMSML:%.ml=%.cmo)
|
||||
SIMSCMX=$(SIMSML:%.ml=%.cmx)
|
||||
|
||||
|
||||
OCAMLC = ocamlc
|
||||
OCAMLOPT=ocamlopt -p
|
||||
OCAMLC = ocamlc -I +xml-light
|
||||
OCAMLOPT=ocamlopt -I +xml-light -p
|
||||
INCLUDES= -I +lablgtk2 -I ../lib/ocaml
|
||||
|
||||
AIRBORNE = ../airborne
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@
|
||||
Q=@
|
||||
|
||||
OCAML=ocaml
|
||||
OCAMLC=ocamlc -I ../lib/ocaml
|
||||
OCAMLC=ocamlc -I ../lib/ocaml -I +xml-light
|
||||
OCAMLLEX=ocamllex
|
||||
OCAMLYACC=ocamlyacc
|
||||
|
||||
|
||||
Reference in New Issue
Block a user