Skip to content

Instantly share code, notes, and snippets.

@euclio
Created April 5, 2015 03:44
Show Gist options
  • Save euclio/2d4a8cbcb4433853a510 to your computer and use it in GitHub Desktop.
Save euclio/2d4a8cbcb4433853a510 to your computer and use it in GitHub Desktop.
Patch to fix generated catkin build files for AR drone on ARM
reverted:
--- b/devel/src/ardronelib/ARDroneLib/VLIB/Platform/video_config.h 2015-04-04 20:24:40.314580931 -0700
+++ a/devel/src/ardronelib/ARDroneLib/VLIB/Platform/video_config.h 2015-04-03 11:09:34.479292912 -0700
@@ -8,7 +8,7 @@
////////////////////////////////////////////
#if TARGET_CPU_ARM == 1
// IPhone
+#if defined (USE_ANDROID) || defined (TARGET_OS_IPHONE) || defined (USE_LINUX)
-#if defined (USE_ANDROID) || defined (TARGET_OS_IPHONE)
#include "arm11/video_config.h"
#endif // TARGET_OS_IPHONE
reverted:
--- b/devel/src/ardronelib/ARDroneLib/VP_SDK/Build/sysvar.makefile 2015-04-04 20:24:40.329580931 -0700
+++ a/devel/src/ardronelib/ARDroneLib/VP_SDK/Build/sysvar.makefile 2015-04-03 11:09:34.480292912 -0700
@@ -375,6 +375,11 @@
endif
endif
+ifeq ($(USE_ARMV7),yes)
+ TARGET_CPU_ARM=1
+ TARGET_CPU_X86=0
+endif
+
# All that needs to be exported
########################
reverted:
--- b/devel/src/ardronelib/ARDroneLib/VP_SDK/Build/vlib.makefile 2015-04-04 20:24:40.329580931 -0700
+++ a/devel/src/ardronelib/ARDroneLib/VP_SDK/Build/vlib.makefile 2015-04-03 11:09:34.480292912 -0700
@@ -59,6 +59,12 @@
Platform/arm9_P6/UVLC/uvlc_mb_layer_p6.S
endif
+ifeq ($(USE_ARMV7),yes)
+ GENERIC_LIBRARY_SOURCE_FILES+= \
+ Platform/arm11/video_utils.c \
+ Platform/arm11/UVLC/uvlc_codec.c
+endif
+
ifeq ($(USE_IPHONE),yes)
ifeq ($(PLATFORM_NAME),iphoneos)
GENERIC_LIBRARY_SOURCE_FILES+= \
reverted:
--- b/devel/src/ardronelib/Makefile 2015-04-04 20:24:40.355580931 -0700
+++ a/devel/src/ardronelib/Makefile 2015-04-03 11:15:15.532292831 -0700
@@ -1,6 +1,7 @@
SDK_PATH:=$(shell pwd)/ARDroneLib
PC_TARGET=yes
USE_LINUX=yes
+USE_ARMV7=yes
ifdef MYKONOS
@@ -15,10 +16,12 @@
SDK_FLAGS+="USE_APP=no"
SDK_FLAGS+="USE_LIB=yes"
+SDK_FLAGS+="USE_LINUX=yes"
+SDK_FLAGS+="USE_ARMV7=yes"
all:
+ @$(MAKE) -C $(SDK_PATH)/Soft/Build $(TMP_SDK_FLAGS) $(SDK_FLAGS) $(MAKECMDGOALS)
+ @$(MAKE) -C $(SDK_PATH)/VP_SDK/Build $(TMP_SDK_FLAGS) $(SDK_FLAGS) $(MAKECMDGOALS)
- @$(MAKE) -C $(SDK_PATH)/Soft/Build $(TMP_SDK_FLAGS) $(SDK_FLAGS) $(MAKECMDGOALS) USE_LINUX=yes
- @$(MAKE) -C $(SDK_PATH)/VP_SDK/Build $(TMP_SDK_FLAGS) $(SDK_FLAGS) $(MAKECMDGOALS) USE_LINUX=yes
install:
mkdir -p ${INSTALL_PREFIX}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment