Kaydet (Commit) f5222224 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Make also the libcurl library end in .so for Android

üst ccdd1b9a
--- misc/curl-7.19.7/ltmain.sh
+++ misc/build/curl-7.19.7/ltmain.sh
@@ -3228,6 +3228,12 @@
func_warning "\`-release' is ignored for convenience libraries"
else
+ # Force no versioning suffix for Android thanks to silly
+ # apkbuilder which doesn't add extra native libs unless their
+ # name ends with .so
+
+ version_type=none
+
# Parse the version information argument.
save_ifs="$IFS"; IFS=':'
set dummy $vinfo 0 0 0
...@@ -54,6 +54,9 @@ PATCH_FILES=\ ...@@ -54,6 +54,9 @@ PATCH_FILES=\
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(OS)" == "ANDROID"
PATCH_FILES+=curl-android.patch
.ENDIF
#CONVERTFILES= \ #CONVERTFILES= \
lib$/Makefile.vc6 lib$/Makefile.vc6
...@@ -96,6 +99,8 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS) ...@@ -96,6 +99,8 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
.IF "$(OS)"=="IOS" .IF "$(OS)"=="IOS"
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a
.ELIF "$(OS)"=="ANDROID"
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.so
.ELSE .ELSE
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).? OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).?
.ENDIF .ENDIF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment