Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-22 20:36:06 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Quick fix of one of the causes of errors in Snow Leopard. No doubt there will be other make files with the same issue.

Browse Source 
A better option would be to merge dev into the aspirin2 branch where these issues have already been fixed.
This commit is contained in:
Bernard Davison
2012-03-06 21:44:08 +11:00
parent 0963056dbc
commit 3ca303279c
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/lpc21iap/Makefile
+2 -2
View File
@@ -27,8 +27,8 @@ endif
UNAME = $(shell uname -s)
ifeq ("$(UNAME)","Darwin")
LIBRARYS = -L /opt/paparazzi/lib -L /opt/local/lib
INCLUDES = -I /opt/paparazzi/include -I /opt/local/include/
LIBRARYS = -L/opt/paparazzi/lib -L/opt/local/lib
INCLUDES = -I/opt/paparazzi/include -I/opt/local/include/
endif
sw/lib/ocaml/ivy/Makefile
+2 -2
View File
@@ -52,8 +52,8 @@ UNAME = $(shell uname -s)
UNAME = $(shell uname -s)
ifeq ("$(UNAME)","Darwin")
LIBRARYS = -L /opt/paparazzi/lib -L /opt/local/lib
INCLUDES = -I /opt/paparazzi/include -I /opt/local/include/
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
sw/simulator/old_booz/tests/Makefile
+4 -4
View File
@@ -4,10 +4,10 @@
#JSBSIM = /usr/local
#CC = g++
#CFLAGS = -Wall -I $(JSBSIM)/include/JSBSim -I../include
#LDFLAGS = -L $(JSBSIM)/lib -lJSBSim
#CFLAGS += -I /usr/include/meschach -I /usr/local/include/
#LDFLAGS += -lmeschach -L /usr/lib
#CFLAGS = -Wall -I$(JSBSIM)/include/JSBSim -I../include
#LDFLAGS = -L$(JSBSIM)/lib -lJSBSim
#CFLAGS += -I/usr/include/meschach -I/usr/local/include/
#LDFLAGS += -lmeschach -L/usr/lib
#CFLAGS += `pkg-config glib-2.0 --cflags`
#LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lglibivy -lpcre