Adapt for DISABLE_DYNLOADING instead of just iOS

Change-Id: I26bc5d87725eb9ae00387e42e9a65ed26a8ec168

Adapt for DISABLE_DYNLOADING instead of just iOS
Change-Id: I26bc5d87725eb9ae00387e42e9a65ed26a8ec168
711fcb41 · Tor Lillqvist · Tor Lillqvist · 0cae0cc4 · 711fcb41
Kaydet (Commit) 711fcb41 authored Eyl 14, 2012 tarafından Tor Lillqvist Kaydeden (comit) Tor Lillqvist Eyl 14, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

makefile.mk curl/makefile.mk +2 -2

No files found.
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -83,7 +83,7 @@ curl_LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
 CONFIGURE_DIR=.$/
 #relative to CONFIGURE_DIR
 CONFIGURE_ACTION=.$/configure
-.IF "$(OS)"=="IOS"
+.IF "$(DISABLE_DYNLOADING)" == "TRUE"
 CONFIGURE_FLAGS=--disable-shared
 .ELSE
 CONFIGURE_FLAGS=--disable-static
@@ -106,7 +106,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)

-.IF "$(OS)"=="IOS"
+.IF "$(DISABLE_DYNLOADING)" == "TRUE"
 OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a
 .ELIF "$(OS)"=="ANDROID"
 OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.so