makefie changes to allow osx binary installer

This commit is contained in:
lamestllama
2011-12-23 13:27:46 +10:30
parent eca7bbaa18
commit 31ff0c23a8
4 changed files with 11 additions and 7 deletions
@@ -178,7 +178,7 @@ ap_srcs += $(SRC_FIXEDWING)/estimator.c
UNAME = $(shell uname -s)
ifeq ("$(UNAME)","Darwin")
sim.CFLAGS += -I/opt/local/include/
sim.CFLAGS += -I/opt/paparazzi/include/ -I/opt/local/include/
endif
sim.CFLAGS += $(CPPFLAGS)
+2 -2
View File
@@ -27,8 +27,8 @@ endif
UNAME = $(shell uname -s)
ifeq ("$(UNAME)","Darwin")
INCLUDES=-I/opt/local/include/
LIBRARYS=-L/opt/local/lib
LIBRARYS = -L /opt/paparazzi/lib -L /opt/local/lib
INCLUDES = -I /opt/paparazzi/include -I /opt/local/include/
endif
+3 -2
View File
@@ -1,7 +1,8 @@
UNAME = $(shell uname -s)
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
LIBRARYS = -s
endif
@@ -19,4 +20,4 @@ kestrel2ivy: kestrel2ivy.o
g++ -o kestrel2ivy kestrel2ivy.o $(LIBRARYS) -livy
%.o : %.c
gcc -c -O2 -Wall -I /opt/local/include/ $<
gcc -c -O2 -Wall $(INCLUDES) $<
+5 -2
View File
@@ -49,8 +49,11 @@ TKIVYCMX= $(TKIVY:.ml=.cmx)
UNAME = $(shell uname -s)
UNAME = $(shell uname -s)
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
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 $<
.c.o :
$(CC) -Wall -c $(FPIC) -I /opt/local/include/ $(OCAMLINC) $(GLIBINC) $<
$(CC) -Wall -c $(FPIC) $(INCLUDES) $(OCAMLINC) $(GLIBINC) $<
.mli.cmi :
$(OCAMLMLI) $(OCAMLFLAGS) -c $<
.ml.cmx :