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

Removing spaces between linker path options (-L) and the path to be added. Fixing issue 142

Browse Source
This commit is contained in:
Bernard Davison
2012-03-01 18:12:33 +11:00
parent 8ab6319323
commit 81d88ed344
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/lpc21iap/Makefile
+1 -1
View File
@@ -27,7 +27,7 @@ endif
UNAME = $(shell uname -s) UNAME = $(shell uname -s)
ifeq ("$(UNAME)","Darwin") ifeq ("$(UNAME)","Darwin")
LIBRARYS = $(shell if test -d /opt/local/lib; then echo "-L /opt/local/lib"; elif test -d /opt/paparazzi/lib; then echo "-L /opt/paparazzi/lib"; fi) LIBRARYS = $(shell if test -d /opt/local/lib; then echo "-L/opt/local/lib"; elif test -d /opt/paparazzi/lib; then echo "-L/opt/paparazzi/lib"; fi)
INCLUDES = $(shell if test -d /opt/local/include; then echo "-I /opt/local/include"; elif test -d /opt/paparazzi/include; then echo "-I /opt/paparazzi/include"; fi) INCLUDES = $(shell if test -d /opt/local/include; then echo "-I /opt/local/include"; elif test -d /opt/paparazzi/include; then echo "-I /opt/paparazzi/include"; fi)
endif endif
sw/ground_segment/misc/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
UNAME = $(shell uname -s) UNAME = $(shell uname -s)
ifeq ("$(UNAME)","Darwin") ifeq ("$(UNAME)","Darwin")
LIBRARYS = $(shell if test -d /opt/local/lib; then echo "-L /opt/local/lib"; elif test -d /opt/paparazzi/lib; then echo "-L /opt/paparazzi/lib"; fi) LIBRARYS = $(shell if test -d /opt/local/lib; then echo "-L/opt/local/lib"; elif test -d /opt/paparazzi/lib; then echo "-L/opt/paparazzi/lib"; fi)
INCLUDES = $(shell if test -d /opt/local/include; then echo "-I /opt/local/include"; elif test -d /opt/paparazzi/include; then echo "-I /opt/paparazzi/include"; fi) INCLUDES = $(shell if test -d /opt/local/include; then echo "-I /opt/local/include"; elif test -d /opt/paparazzi/include; then echo "-I /opt/paparazzi/include"; fi)
else else
LIBRARYS = -s LIBRARYS = -s
sw/simulator/old_booz/tests/Makefile
+3 -3
View File
@@ -5,9 +5,9 @@
#CC = g++ #CC = g++
#CFLAGS = -Wall -I $(JSBSIM)/include/JSBSim -I../include #CFLAGS = -Wall -I $(JSBSIM)/include/JSBSim -I../include
#LDFLAGS = -L $(JSBSIM)/lib -lJSBSim #LDFLAGS = -L$(JSBSIM)/lib -lJSBSim
#CFLAGS += -I /usr/include/meschach -I /usr/local/include/ #CFLAGS += -I /usr/include/meschach -I /usr/local/include/
#LDFLAGS += -lmeschach -L /usr/lib #LDFLAGS += -lmeschach -L/usr/lib
#CFLAGS += `pkg-config glib-2.0 --cflags` #CFLAGS += `pkg-config glib-2.0 --cflags`
#LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lglibivy -lpcre #LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lglibivy -lpcre
@@ -33,7 +33,7 @@ CFLAGS = -Wall \
LDFLAGS = -lm \ LDFLAGS = -lm \
-lglibivy \ -lglibivy \
-L $(JSBSIM)/lib -lJSBSim \ -L$(JSBSIM)/lib -lJSBSim \
`pkg-config glib-2.0 --libs` \ `pkg-config glib-2.0 --libs` \
SIMDIR = .. SIMDIR = ..