diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | RepositoryFixes.mk | 2 | ||||
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 1 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | external/lcms2/ExternalPackage_lcms2.mk | 16 |
5 files changed, 14 insertions, 14 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0ff4f7482dfa..fe8766874848 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1662,9 +1662,7 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_use_libraries,$(1),\ - lcms2 \ -) +$(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS)) endef diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 726ba42405e2..b648aa577676 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -117,11 +117,11 @@ gb_Library_ILIBFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_ILIBFILENAMES)) gb_Library_NOILIBFILENAMES_D := \ icudt icuin icuuc \ - lcms2 \ # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema gb_Library_NOILIBFILENAMES := \ langtag \ + lcms2 \ lpsolve55 \ xpcom \ xpcom_core \ diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 77995be98efd..d5af717fc516 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -89,6 +89,7 @@ LIBS = \ $(HYPHEN_LIB) \ $(MYTHES_LIBS) \ $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/lcms2/src/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libmspub/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libmwaw/src/lib/.libs/*.a) \ diff --git a/configure.ac b/configure.ac index 6e59d122f323..ad72a5c2856a 100644 --- a/configure.ac +++ b/configure.ac @@ -7791,10 +7791,13 @@ if test "$with_system_lcms2" = "yes"; then else SYSTEM_LCMS2=NO fi -libo_CHECK_SYSTEM_MODULE([lcms2],[LCMS2],[lcms2],["-I${WORKDIR}/UnpackedTarball/lcms2/include"],["-L${OUTDIR}/lib -llcms2"]) +libo_CHECK_SYSTEM_MODULE([lcms2],[LCMS2],[lcms2],["-I${WORKDIR}/UnpackedTarball/lcms2/include"],["-L${WORKDIR}/UnpackedTarball/lcms2/src/.libs -llcms2"]) if test "$GCC" = "yes"; then LCMS2_CFLAGS="${LCMS2_CFLAGS} -Wno-long-long" fi +if test "$COM" = "MSC"; then # override the above + LCMS2_LIBS=${WORKDIR}/UnpackedTarball/lcms2/bin/lcms2.lib +fi dnl =================================================================== dnl Check for system cppunit diff --git a/external/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk index 395be9a1b9f3..4d1c98e414db 100644 --- a/external/lcms2/ExternalPackage_lcms2.mk +++ b/external/lcms2/ExternalPackage_lcms2.mk @@ -8,25 +8,23 @@ # $(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2)) + $(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2)) +ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dylib,src/.libs/liblcms2.dylib)) $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib)) -else ifeq ($(filter-out IOS ANDROID,$(OS)),) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.a,src/.libs/liblcms2.a)) else ifeq ($(OS),WNT) ifeq ($(COM),GCC) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dll.a,src/.libs/liblcms2.dll.a)) $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/liblcms2-2.dll,src/.libs/liblcms2-2.dll)) else ifeq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib,bin/lcms2.lib)) # note: the lcms2d.lib references LCMS2.DLL (without D!) but the dll is # actually called LCMS2D.DLL then $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll)) -endif -else -$(eval $(call gb_ExternalPackage_add_symbolic_link,lcms2,lib/liblcms2.so,liblcms2.so.2)) +endif # $(COM) +else # $(OS) != WNT/MACOSX $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2.0.4)) -endif +endif # $(OS) +endif # $(DISABLE_DYNLOADING) + # vim: set noet sw=4 ts=4: |