Permalink
Browse files

Fixing build for Linux. If build for OSX break, look here.

  • Loading branch information...
1 parent 436c4f1 commit e529440aaa3432c03ea36a45d830a2212104f666 John Boiles committed with Mar 16, 2012
View
@@ -12,4 +12,6 @@ Examples/iPhone/FreeFlight/FreeFlight.xcodeproj/xcuserdata/
Examples/iPhone/FreeFlight/build/
Docs/html/
Docs/latex/
-
+Examples/Linux/Build/
+Examples/Linux/Testbenches/
+Examples/Linux/Testbenches/
@@ -20,7 +20,7 @@ verify()
packages="";
if [ `which uname` ] ; then
- if [ `uname -a | grep Ubuntu` ] ; then
+ if [ `uname -a | grep Ubuntu | wc -l` ] ; then
echo "\033[31mChecking required Ubuntu packages ...\033[0m";
@@ -36,7 +36,7 @@ if [ `which uname` ] ; then
verify "libavfilter-dev";
#To use the Wiimote in Navigation
- verify "libcwiid1-dev";
+ verify "libcwiid-dev";
verify "libbluetooth-dev";
#To compile Navigation
@@ -89,16 +89,18 @@ GENERIC_LIBRARY_SOURCE_FILES+= \
$(ARDRONE_TOOL_DIR)/Control/ardrone_navdata_control.c \
$(ARDRONE_TOOL_DIR)/Navdata/ardrone_navdata_client.c
- ifeq ($(USE_IPHONE),no)
- ifeq($(USE_MACOSX),no)
+ ifneq ($(USE_IPHONE),yes)
+ ifneq ($(USE_MACOSX),yes)
GENERIC_LIBRARY_SOURCE_FILES+= \
$(ARDRONE_TOOL_DIR)/Com/config_serial.c
endif
- endif
-
+ endif
+
ifeq ($(USE_ARDRONE_VICON),yes)
GENERIC_CFLAGS+=-DUSE_ARDRONE_VICON
endif
+
+ endif
endif
endif
@@ -20,6 +20,7 @@ USE_JPEG_P6=no
USE_SWING=no
USE_VLIB=yes
SWING_VERSION=head
+USE_MACOSX=no
# Check validity of script usage.
if [ $1 ] && [ $1 = ecos ] ; then

0 comments on commit e529440

Please sign in to comment.