generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #789 from asmorkalov:android_na_mk_fix

Browse Source
This commit is contained in:
Andrey Kamaev 2013-04-09 13:14:21 +04:00 committed by OpenCV Buildbot
commit 71896544ca
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/android/native-activity/jni/Android.mk
View File

@ -6,7 +6,7 @@ include ../../sdk/native/jni/OpenCV.mk
LOCAL_MODULE := native_activity LOCAL_MODULE := native_activity
LOCAL_SRC_FILES := native.cpp LOCAL_SRC_FILES := native.cpp
LOCAL_LDLIBS := -lm -llog -landroid LOCAL_LDLIBS += -lm -llog -landroid
LOCAL_STATIC_LIBRARIES := android_native_app_glue LOCAL_STATIC_LIBRARIES := android_native_app_glue
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
samples/android/native-activity/jni/Application.mk
View File

@ -1,2 +1,4 @@
APP_ABI := armeabi-v7a APP_ABI := armeabi-v7a
APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -fexceptions
APP_PLATFORM := android-9 APP_PLATFORM := android-9