File tree Expand file tree Collapse file tree
openFrameworksCompiled/project/android/openframeworksAndroid Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -128,7 +128,6 @@ enum ofTargetPlatform{
128128#elif defined (__ANDROID__)
129129 #define TARGET_ANDROID
130130 #define TARGET_OPENGLES
131- #define TARGET_IMPLEMENTS_URL_LOADER
132131// #elif defined(__ARMEL__)
133132#elif defined(__ARM__)
134133 #define TARGET_LINUX
@@ -410,11 +409,11 @@ typedef TESSindex ofIndexType;
410409 #elif __has_include(<filesystem>)
411410 // If we're compiling on Visual Studio and are not compiling with C++17, we need to use experimental
412411 #ifdef _MSC_VER
413-
412+
414413 // Check and include header that defines "_HAS_CXX17"
415414 #if __has_include(<yvals_core.h>)
416415 #include < yvals_core.h>
417-
416+
418417 // Check for enabled C++17 support
419418 #if defined(_HAS_CXX17) && _HAS_CXX17
420419 // We're using C++17, so let's use the normal version
Original file line number Diff line number Diff line change @@ -208,6 +208,8 @@ include_directories(
208208 ${PRJ_LIBS_ROOT} /tess2/include
209209 ${PRJ_LIBS_ROOT} /zlib/include
210210 ${PRJ_LIBS_ROOT} /uriparser/include
211+ ${PRJ_LIBS_ROOT} /openssl/include
212+ ${PRJ_LIBS_ROOT} /curl/include
211213)
212214
213215find_library (android -lib android )
@@ -255,5 +257,7 @@ target_link_libraries(openFrameworksAndroid
255257 ${PRJ_LIBS_ROOT} /pugixml/lib/android/${ANDROID_ABI}/libpugixml.a
256258 ${PRJ_LIBS_ROOT} /tess2/lib/android/${ANDROID_ABI}/libtess2.a
257259 ${PRJ_LIBS_ROOT} /uriparser/lib/android/${ANDROID_ABI}/liburiparser.a
258-
260+ ${PRJ_LIBS_ROOT} /openssl/lib/android/${ANDROID_ABI}/libssl.a
261+ ${PRJ_LIBS_ROOT} /openssl/lib/android/${ANDROID_ABI}/libcrypto.a
262+ ${PRJ_LIBS_ROOT} /curl/lib/android/${ANDROID_ABI}/libcurl.a
259263)
You can’t perform that action at this time.
0 commit comments