Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 22:17:01 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

Fixing erroneous changes I previously made. Oop... #142

Browse Source
This commit is contained in:
Bernard Davison
2012-03-03 14:13:44 +11:00
parent 47f340faa7
commit ace14fc67e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/Makefile.avr
+1 -1
View File
@@ -28,7 +28,7 @@
# #
ATMELBIN = /usr/bin ATMELBIN = /usr/bin
ATMEL_INCLUDES = -I/usr/avr/include ATMEL_INCLUDES = -I /usr/avr/include
ATMEL_LIBPATH = -B /usr/avr/lib/avr4 -B /usr/avr/lib/avr5 ATMEL_LIBPATH = -B /usr/avr/lib/avr4 -B /usr/avr/lib/avr5
PROG_PORT = /dev/parport0 PROG_PORT = /dev/parport0
conf/Makefile.sim
+2 -2
View File
@@ -35,7 +35,7 @@ CC = g++
endif endif
OCAMLC = ocamlc OCAMLC = ocamlc
SIMDIR = $(PAPARAZZI_SRC)/sw/simulator SIMDIR = $(PAPARAZZI_SRC)/sw/simulator
CAMLINCLUDES = $(shell ocamlfind query -r -i-format lablgtk2) -I$(PAPARAZZI_SRC)/sw/lib/ocaml -I$(SIMDIR) $(shell ocamlfind query -r -i-format xml-light) CAMLINCLUDES = $(shell ocamlfind query -r -i-format lablgtk2) -I $(PAPARAZZI_SRC)/sw/lib/ocaml -I $(SIMDIR) $(shell ocamlfind query -r -i-format xml-light)
SIMSITLML = $(OBJDIR)/simsitl.ml SIMSITLML = $(OBJDIR)/simsitl.ml
MYGTKINITCMO = myGtkInit.cmo MYGTKINITCMO = myGtkInit.cmo
SITLCMA = $(SIMDIR)/sitl.cma SITLCMA = $(SIMDIR)/sitl.cma
@@ -48,7 +48,7 @@ Q=@
# #
ifneq ($(SIM_TYPE),JSBSIM) ifneq ($(SIM_TYPE),JSBSIM)
INCLUDES += -I`ocamlc -where` INCLUDES += -I `ocamlc -where`
endif endif
CFLAGS = -W -Wall CFLAGS = -W -Wall