Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
25f65f26
Kaydet (Commit)
25f65f26
authored
Eki 23, 2013
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
lcms2: use libraries from WORKDIR
Change-Id: Ieddc80d510884eeb6f64325f9dfbb34f1d3fb0b5
üst
b177b306
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
14 deletions
+14
-14
RepositoryExternal.mk
RepositoryExternal.mk
+1
-3
RepositoryFixes.mk
RepositoryFixes.mk
+1
-1
Makefile.shared
android/Bootstrap/Makefile.shared
+1
-0
configure.ac
configure.ac
+4
-1
ExternalPackage_lcms2.mk
external/lcms2/ExternalPackage_lcms2.mk
+7
-9
No files found.
RepositoryExternal.mk
Dosyayı görüntüle @
25f65f26
...
...
@@ -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
...
...
RepositoryFixes.mk
Dosyayı görüntüle @
25f65f26
...
...
@@ -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 \
...
...
android/Bootstrap/Makefile.shared
Dosyayı görüntüle @
25f65f26
...
...
@@ -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
)
\
...
...
configure.ac
Dosyayı görüntüle @
25f65f26
...
...
@@ -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
...
...
external/lcms2/ExternalPackage_lcms2.mk
Dosyayı görüntüle @
25f65f26
...
...
@@ -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:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment