Created
October 31, 2013 23:04
-
-
Save mtourne/7258641 to your computer and use it in GitHub Desktop.
Ardrone autonomy patch // armv7
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ARDroneLib/VLIB/Platform/video_config.h b/ARDroneLib/VLIB/Platform/video_config.h | |
index 21263fa..ccb8b6f 100644 | |
--- a/ARDroneLib/VLIB/Platform/video_config.h | |
+++ b/ARDroneLib/VLIB/Platform/video_config.h | |
@@ -8,7 +8,7 @@ | |
//////////////////////////////////////////// | |
#if TARGET_CPU_ARM == 1 | |
// IPhone | |
-#if defined (USE_ANDROID) || defined (TARGET_OS_IPHONE) | |
+#if defined (USE_ANDROID) || defined (TARGET_OS_IPHONE) || defined (USE_LINUX) | |
#include "arm11/video_config.h" | |
#endif // TARGET_OS_IPHONE | |
diff --git a/ARDroneLib/VP_SDK/Build/sysvar.makefile b/ARDroneLib/VP_SDK/Build/sysvar.makefile | |
index 9ad49cb..597e9df 100644 | |
--- a/ARDroneLib/VP_SDK/Build/sysvar.makefile | |
+++ b/ARDroneLib/VP_SDK/Build/sysvar.makefile | |
@@ -375,6 +375,11 @@ else | |
endif | |
endif | |
+ifeq ($(USE_ARMV7),yes) | |
+ TARGET_CPU_ARM=1 | |
+ TARGET_CPU_X86=0 | |
+endif | |
+ | |
# All that needs to be exported | |
######################## | |
diff --git a/ARDroneLib/VP_SDK/Build/vlib.makefile b/ARDroneLib/VP_SDK/Build/vlib.makefile | |
index 220b798..dab42a0 100644 | |
--- a/ARDroneLib/VP_SDK/Build/vlib.makefile | |
+++ b/ARDroneLib/VP_SDK/Build/vlib.makefile | |
@@ -59,6 +59,12 @@ GENERIC_LIBRARY_SOURCE_FILES+= \ | |
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+= \ | |
diff --git a/sdk.makefile b/sdk.makefile | |
index 477c45c..e7473bf 100644 | |
--- a/sdk.makefile | |
+++ b/sdk.makefile | |
@@ -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_TARGET_DIR) | |
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) USE_LINUX=yes | |
- @$(MAKE) -C $(SDK_PATH)/VP_SDK/Build $(TMP_SDK_FLAGS) $(SDK_FLAGS) $(MAKECMDGOALS) USE_LINUX=yes | |
+ @$(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) | |
find $(SDK_PATH)/Soft/Build -type f -name '*.a' -exec cp '{}' ./lib/ \; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment