mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-05-27 17:06:31 +08:00
makefie changes to allow osx binary installer
This commit is contained in:
@@ -178,7 +178,7 @@ ap_srcs += $(SRC_FIXEDWING)/estimator.c
|
|||||||
|
|
||||||
UNAME = $(shell uname -s)
|
UNAME = $(shell uname -s)
|
||||||
ifeq ("$(UNAME)","Darwin")
|
ifeq ("$(UNAME)","Darwin")
|
||||||
sim.CFLAGS += -I/opt/local/include/
|
sim.CFLAGS += -I/opt/paparazzi/include/ -I/opt/local/include/
|
||||||
endif
|
endif
|
||||||
|
|
||||||
sim.CFLAGS += $(CPPFLAGS)
|
sim.CFLAGS += $(CPPFLAGS)
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ endif
|
|||||||
|
|
||||||
UNAME = $(shell uname -s)
|
UNAME = $(shell uname -s)
|
||||||
ifeq ("$(UNAME)","Darwin")
|
ifeq ("$(UNAME)","Darwin")
|
||||||
INCLUDES=-I/opt/local/include/
|
LIBRARYS = -L /opt/paparazzi/lib -L /opt/local/lib
|
||||||
LIBRARYS=-L/opt/local/lib
|
INCLUDES = -I /opt/paparazzi/include -I /opt/local/include/
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
UNAME = $(shell uname -s)
|
UNAME = $(shell uname -s)
|
||||||
|
|
||||||
ifeq ("$(UNAME)","Darwin")
|
ifeq ("$(UNAME)","Darwin")
|
||||||
LIBRARYS = -L/opt/local/lib
|
LIBRARYS = -L /opt/paparazzi/lib -L /opt/local/lib
|
||||||
|
INCLUDES = -I /opt/paparazzi/include -I /opt/local/include/
|
||||||
else
|
else
|
||||||
LIBRARYS = -s
|
LIBRARYS = -s
|
||||||
endif
|
endif
|
||||||
@@ -19,4 +20,4 @@ kestrel2ivy: kestrel2ivy.o
|
|||||||
g++ -o kestrel2ivy kestrel2ivy.o $(LIBRARYS) -livy
|
g++ -o kestrel2ivy kestrel2ivy.o $(LIBRARYS) -livy
|
||||||
|
|
||||||
%.o : %.c
|
%.o : %.c
|
||||||
gcc -c -O2 -Wall -I /opt/local/include/ $<
|
gcc -c -O2 -Wall $(INCLUDES) $<
|
||||||
|
|||||||
@@ -49,8 +49,11 @@ TKIVYCMX= $(TKIVY:.ml=.cmx)
|
|||||||
|
|
||||||
UNAME = $(shell uname -s)
|
UNAME = $(shell uname -s)
|
||||||
|
|
||||||
|
UNAME = $(shell uname -s)
|
||||||
|
|
||||||
ifeq ("$(UNAME)","Darwin")
|
ifeq ("$(UNAME)","Darwin")
|
||||||
LIBRARYS = -L/opt/local/lib
|
LIBRARYS = -L /opt/paparazzi/lib -L /opt/local/lib
|
||||||
|
INCLUDES = -I /opt/paparazzi/include -I /opt/local/include/
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBS = ivy-ocaml.cma ivy-ocaml.cmxa glibivy-ocaml.cma glibivy-ocaml.cmxa
|
LIBS = ivy-ocaml.cma ivy-ocaml.cmxa glibivy-ocaml.cma glibivy-ocaml.cmxa
|
||||||
@@ -102,7 +105,7 @@ tkivy-ocaml.cmxa : $(TKIVYCMX) civy.o ctkivy.o
|
|||||||
$(OCAMLC) $(OCAMLFLAGS) $(INCLUDES) -c $<
|
$(OCAMLC) $(OCAMLFLAGS) $(INCLUDES) -c $<
|
||||||
.c.o :
|
.c.o :
|
||||||
|
|
||||||
$(CC) -Wall -c $(FPIC) -I /opt/local/include/ $(OCAMLINC) $(GLIBINC) $<
|
$(CC) -Wall -c $(FPIC) $(INCLUDES) $(OCAMLINC) $(GLIBINC) $<
|
||||||
.mli.cmi :
|
.mli.cmi :
|
||||||
$(OCAMLMLI) $(OCAMLFLAGS) -c $<
|
$(OCAMLMLI) $(OCAMLFLAGS) -c $<
|
||||||
.ml.cmx :
|
.ml.cmx :
|
||||||
|
|||||||
Reference in New Issue
Block a user