diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-06-06 22:57:56 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-06-07 21:54:17 +0300 |
| commit | bd4d371178f863d09098c3549dc73713423dc560 (patch) | |
| tree | 9717ca8e21bbdceb786dd78a50522144e9261589 | |
| parent | 96caa3b7aea151744c5fa9ba4a4a940817e12531 (diff) | |
Build lcms2 statically for Android, too.
A quick way to avoid the problem with its name ending with ".so.2"
which the Android app machinery doesn't like. Plus, one less shared
library...
Change-Id: I102e29dd13d1be1a134be8c09459259fe8fbe2e1
| -rw-r--r-- | RepositoryExternal.mk | 16 | ||||
| -rw-r--r-- | lcms2/makefile.mk | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 7f91d77c2ba4..323e5bc2e6c5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -945,6 +945,21 @@ endef else # !SYSTEM_LCMS2 +ifeq ($(OS),ANDROID) + +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ + lcms2 \ +)) + +define gb_LinkTarget__use_lcms2 +$(call gb_LinkTarget_use_static_libraries,$(1),\ + lcms2 \ +) + +endef + +else + $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ lcms2 \ )) @@ -956,6 +971,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef +endif # ANDROID endif # SYSTEM_LCMS2 diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 6f619bfaff4e..b6b571f4b29c 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -77,7 +77,7 @@ CONFIGURE_FLAGS += \ --prefix=/@.__________________________________________________$(EXTRPATH) .END -.IF "$(OS)" == "IOS" +.IF "$(OS)" == "IOS" || "$(OS)" == "ANDROID" CONFIGURE_ACTION += --disable-shared .ENDIF @@ -89,7 +89,7 @@ OUT2INC+=include$/lcms2*.h .IF "$(OS)"=="MACOSX" OUT2LIB+=src$/.libs$/liblcms2.*.dylib -.ELIF "$(OS)"=="IOS" +.ELIF "$(OS)"=="IOS" || "$(OS)" == "ANDROID" OUT2LIB+=src$/.libs$/liblcms2.a .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" |