Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp

mpmaster/src/main/cpp/CMakeLists.txt

@@ -51,7 +51,7 @@ add_library( # Sets the name of the library.
 
              # Provides a relative path to your source file(s).
              mpmaster.cpp
-
+        bspatch/bspatch.c
         )
 
 # Searches for a specified prebuilt library and stores the path as a
@@ -76,5 +76,5 @@ target_link_libraries( # Specifies the target library.
 
                        # Links the target library to the log library
                        # included in the NDK.
-                        bspatch
+
                        ${log-lib} )

mpmaster/src/main/cpp/mpmaster.cpp

@@ -36,7 +36,7 @@
 #define PATH_MPAPP_STATS        "/sdcard/com.xypower.mpapp/data/stats/"
 #define PATH_MPAPP_RUNNING      "/sdcard/com.xypower.mpapp/running"
 
-int bspatch_main(int argc,char * argv[]);
+extern int bspatch_main(int argc,char * argv[]);
 
 typedef struct
 {