native dll

huailiang · May 27, 2020 · 9a94130 · 9a94130
1 parent b1c2fc6
commit 9a94130
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/Assets/LipSync/Plugins/Android/libs/armeabi-v7a/libZSolver.so b/Assets/LipSync/Plugins/Android/libs/armeabi-v7a/libZSolver.so
diff --git a/Assets/LipSync/Plugins/Android/libs/x86/libZSolver.so b/Assets/LipSync/Plugins/Android/libs/x86/libZSolver.so
diff --git a/Assets/LipSync/Plugins/iOS/libZSolver.a b/Assets/LipSync/Plugins/iOS/libZSolver.a
diff --git a/zsolve/CMakeLists.txt b/zsolve/CMakeLists.txt
@@ -57,7 +57,9 @@ if (APPLE)
         add_library(XRoot STATIC
            ${CORE_GSL}
         )
-		set_xcode_property (ZSolver IPHONEOS_DEPLOYMENT_TARGET "7.0" "all")
+        macro (set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE)
+		set_xcode_property (ZSolver IPHONEOS_DEPLOYMENT_TARGET "8.0" "all")
+        endmacro (set_xcode_property)
     else ()
         set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD_64_BIT)")
         add_library(ZSolver MODULE
@@ -77,9 +79,15 @@ else ( )
 endif ( )
 
 
-target_compile_definitions (ZSolver PRIVATE COMPATIBLE_FORMAT)
+# target_compile_definitions (ZSolver PRIVATE COMPATIBLE_FORMAT)
 
-if(UINT_ESPECIALLY)
-    ADD_DEFINITIONS(-DUINT_ESPECIALLY)
-endif()
+# if(UINT_ESPECIALLY)
+#     ADD_DEFINITIONS(-DUINT_ESPECIALLY)
+# endif()
+
+# if ( WIN32 )
+#     target_link_libraries(ZSolver ws2_32)
+# else( )
+#     target_link_libraries(ZSolver m)
+# endif()
 
diff --git a/zsolve/generate_android.sh b/zsolve/generate_android.sh
@@ -19,14 +19,24 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-export ANDROID_NDK=~/Documents/software/eclipse/android-ndk-r20b
+
+export ANDROID_NDK=~/Documents/software/eclipse/android-ndk-r10e
 
 if [[ ! -d ${ANDROID_NDK} ]]; then
 	echo "ndk file not found"
 	exit 1
 fi
 
 mkdir -p build_v7a && cd build_v7a
-cmake -DANDROID_ABI=armeabi-v7a -DCMAKE_TOOLCHAIN_FILE=../cmake/android.toolchain.cmake -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.6 -DANDROID_NATIVE_API_LEVEL=android-9 ../
+cmake -DANDROID_ABI=armeabi-v7a -DCMAKE_TOOLCHAIN_FILE=../cmake/android.toolchain.cmake -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 -DANDROID_NATIVE_API_LEVEL=android-16 ..
 cd ..
 cmake --build build_v7a --config Release
+mkdir -p Plugins/Android/libs/armeabi-v7a/
+cp build_v7a/libZSolver.so Plugins/Android/libs/armeabi-v7a/libZSolver.so
+
+mkdir -p build_x86  && cd build_x86
+cmake -DANDROID_ABI=x86 -DCMAKE_TOOLCHAIN_FILE=../cmake/android.toolchain.cmake -DANDROID_TOOLCHAIN_NAME=x86-clang3.5 -DANDROID_NATIVE_API_LEVEL=android-9 ../
+cd ..
+cmake --build build_x86 --config Release
+mkdir -p Plugins/Android/libs/x86/
+cp build_x86/libZSolver.so Plugins/Android/libs/x86/libZSolver.so