File tree Expand file tree Collapse file tree 2 files changed +14
-1
lines changed
libs/openFrameworksCompiled/project/android Expand file tree Collapse file tree 2 files changed +14
-1
lines changed Original file line number Diff line number Diff line change @@ -107,6 +107,7 @@ for ARCHE in $ARCH; do
107107 -DANDROID_TOOLCHAIN=clang \
108108 -DANDROID_NDK_ROOT=$ANDROID_NDK_ROOT \
109109 -DANDROID_ABI=${ARCHE} \
110+ -DANDROID=TRUE \
110111 -DANDROID_API=${ANDROID_API} \
111112 -DCMAKE_MAKE_PROGRAM=" ${NINJA_PATH} " \
112113 -DCMAKE_CXX_FLAGS=" -DUSE_PTHREADS=1 -fvisibility-inlines-hidden -std=c++${CPP_STANDARD} -frtti" \
Original file line number Diff line number Diff line change @@ -117,6 +117,8 @@ include_directories(
117117 ${PRJ_LIBS_ROOT} /curl/include
118118)
119119
120+ add_definitions (-DANDROID)
121+
120122find_library (ANDROID_LIB NAMES android)
121123find_library (LOG_LIB NAMES log )
122124find_library (GLES1_LIB NAMES GLESv1_CM)
@@ -131,6 +133,17 @@ target_link_libraries(openFrameworksAndroid
131133 dl
132134 )
133135
136+ find_library (atomic_lib atomic)
137+ if (atomic_lib)
138+ target_link_libraries (openFrameworksAndroid ${atomic_lib} )
139+ endif ()
140+
141+ find_library (mediandk_lib mediandk)
142+
143+ target_link_libraries (openFrameworksAndroid
144+ ${mediandk_lib}
145+ )
146+
134147target_link_libraries (openFrameworksAndroid
135148 ${ANDROID_LIB}
136149 ${GLES2_LIB}
@@ -139,7 +152,6 @@ target_link_libraries(openFrameworksAndroid
139152 ${LOG_LIB}
140153)
141154
142-
143155target_link_libraries (openFrameworksAndroid
144156 ${PRJ_LIBS_ROOT} /brotli/lib/android/${ANDROID_ABI} /libbrotlicommon.a
145157 ${PRJ_LIBS_ROOT} /brotli/lib/android/${ANDROID_ABI} /libbrotlidec.a
You can’t perform that action at this time.
0 commit comments