Skip to content

C
core
Kaydet (Commit) fb0acc2d 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: I7dac78be5a1165ff5cdbd53fd02b907a4fa68a3b
üst aa932258
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
libxslt/makefile.mk
Dosyayı görüntüle @ fb0acc2d
...@@ -130,8 +130,10 @@ CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none ...@@ -130,8 +130,10 @@ CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none
CONFIGURE_DIR= CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure CONFIGURE_ACTION=.$/configure
.IF "$(OS)"=="IOS" .IF "$(DISABLE_DYNLOADING)" == "TRUE"
.IF "$(OS)" == "IOS"
CONFIGURE_ACTION+=LIBS=-liconv CONFIGURE_ACTION+=LIBS=-liconv
.ENDIF
CONFIGURE_FLAGS=--disable-shared CONFIGURE_FLAGS=--disable-shared
.ELSE .ELSE
CONFIGURE_FLAGS=--disable-static CONFIGURE_FLAGS=--disable-static
...@@ -166,7 +168,7 @@ OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib ...@@ -166,7 +168,7 @@ OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib
OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib
OUT2BIN_NONE+=xsltproc$/.libs$/xsltproc OUT2BIN_NONE+=xsltproc$/.libs$/xsltproc
OUT2BIN+=xslt-config OUT2BIN+=xslt-config
.ELIF "$(OS)"=="IOS" .ELIF "$(DISABLE_DYNLOADING)" == "TRUE"
OUT2LIB+=libxslt$/.libs$/libxslt.a OUT2LIB+=libxslt$/.libs$/libxslt.a
OUT2LIB+=libexslt$/.libs$/libexslt.a OUT2LIB+=libexslt$/.libs$/libexslt.a
OUT2BIN+=xslt-config OUT2BIN+=xslt-config
......
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