diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index 17da6f17..72dfad43 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -48,7 +48,9 @@ project("microphoto") # message(FATAL_ERROR "OpenCV ${OpenCV_DIR}") + find_package(OpenCV REQUIRED core imgproc highgui) +# find_package(OpenCV REQUIRED core imgproc) if(OpenCV_FOUND) include_directories(${OpenCV_INCLUDE_DIRS}) message(WARNING "OpenCV library status:") @@ -294,16 +296,16 @@ add_library( # Sets the name of the library. MicroPhoto.cpp TerminalDevice.cpp PhoneDevice.cpp - // PhoneDevice2.cpp - // Camera.cpp - // Camera2Reader.cpp - // TextPaint.cpp + # PhoneDevice2.cpp + Camera.cpp + Camera2Reader.cpp + # TextPaint.cpp CvText.cpp SerialPort.cpp ncnn/yolov5ncnn.cpp - // camera2/OpenCVFont.cpp + # camera2/OpenCVFont.cpp ${CAMERA2_SOURCES} @@ -363,6 +365,7 @@ find_library( # Sets the name of the path variable. # can link multiple libraries, such as libraries you define in this # build script, prebuilt third-party libraries, or system libraries. + target_link_libraries( # Specifies the target library. microphoto @@ -381,3 +384,4 @@ target_link_libraries( # Specifies the target library. ) +# set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS_RELEASE "-strip-all") diff --git a/app/src/main/cpp/PhoneDevice2.cpp b/app/src/main/cpp/PhoneDevice2.cpp index 9408115a..4dd6341e 100644 --- a/app/src/main/cpp/PhoneDevice2.cpp +++ b/app/src/main/cpp/PhoneDevice2.cpp @@ -26,7 +26,7 @@ // #include // #include -#include +// #include #include #include diff --git a/gradle.properties b/gradle.properties index b4d7f13a..eb8cc61f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,6 +19,7 @@ android.useAndroidX=true android.enableJetifier=true opencvsdk=D:/Workspace/deps/opencv-mobile-4.9.0-android +# opencvsdk=D:/Workspace/deps/opencv-mobile-3.4.20-android coreroot=D:/Workspace/Github/xymp/xymp/Core # opencvsdk=D:/Workspace/deps/opencv-v5 asioroot=D:/Workspace/deps/asio-1.28.0