Skip to content

C
core
Kaydet (Commit) 711fcb41 authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Tor Lillqvist
Dosyalara gözat
Seçenekler

Adapt for DISABLE_DYNLOADING instead of just iOS 

Change-Id: I26bc5d87725eb9ae00387e42e9a65ed26a8ec168
üst 0cae0cc4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
curl/makefile.mk
Dosyayı görüntüle @ 711fcb41
...@@ -83,7 +83,7 @@ curl_LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) ...@@ -83,7 +83,7 @@ curl_LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
CONFIGURE_DIR=.$/ CONFIGURE_DIR=.$/
#relative to CONFIGURE_DIR #relative to CONFIGURE_DIR
CONFIGURE_ACTION=.$/configure CONFIGURE_ACTION=.$/configure
.IF "$(OS)"=="IOS" .IF "$(DISABLE_DYNLOADING)" == "TRUE"
CONFIGURE_FLAGS=--disable-shared CONFIGURE_FLAGS=--disable-shared
.ELSE .ELSE
CONFIGURE_FLAGS=--disable-static CONFIGURE_FLAGS=--disable-static
...@@ -106,7 +106,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib ...@@ -106,7 +106,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib
BUILD_ACTION=$(GNUMAKE) BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_FLAGS+= -j$(EXTMAXPROCESS)
.IF "$(OS)"=="IOS" .IF "$(DISABLE_DYNLOADING)" == "TRUE"
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a
.ELIF "$(OS)"=="ANDROID" .ELIF "$(OS)"=="ANDROID"
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.so OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.so
......
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