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
b8f39c5c
Kaydet (Commit)
b8f39c5c
authored
Eki 05, 2012
tarafından
Fridrich Štrba
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Uploading a new shiny libcdr-0.0.9
Change-Id: I5bb93f9228e69dfd46b450089f34cac7204f10b8
üst
8f6d8d47
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
122 additions
and
50 deletions
+122
-50
RepositoryExternal.mk
RepositoryExternal.mk
+5
-2
configure.in
configure.in
+1
-1
ExternalPackage_libcdr.mk
libcdr/ExternalPackage_libcdr.mk
+9
-0
ExternalProject_libcdr.mk
libcdr/ExternalProject_libcdr.mk
+106
-0
Module_libcdr.mk
libcdr/Module_libcdr.mk
+1
-1
StaticLibrary_cdr.mk
libcdr/StaticLibrary_cdr.mk
+0
-46
No files found.
RepositoryExternal.mk
Dosyayı görüntüle @
b8f39c5c
...
...
@@ -940,12 +940,15 @@ endef
else # !SYSTEM_LIBCDR
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
cdr
lib
\
cdr
-0.0
\
))
define gb_LinkTarget__use_cdr
$(call gb_LinkTarget_use_package,$(1),\
libcdr \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
cdr
lib
\
cdr
-0.0
\
)
endef
...
...
configure.in
Dosyayı görüntüle @
b8f39c5c
...
...
@@ -6791,7 +6791,7 @@ elif test $_os = iOS; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBCDR=NO
CDR_TARBALL=
ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8
.tar.bz2
CDR_TARBALL=
3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9
.tar.bz2
fi
AC_SUBST(SYSTEM_LIBCDR)
AC_SUBST(CDR_CFLAGS)
...
...
libcdr/ExternalPackage_libcdr.mk
Dosyayı görüntüle @
b8f39c5c
...
...
@@ -16,4 +16,13 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr_inc,inc/external/libc
src/lib/CMXDocument.h \
))
$(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr))
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_ExternalPackage_add_file,libcdr,lib/cdr-0.0.lib,build/win32/Release/lib/libcdr-0.0.lib))
else
$(eval $(call gb_ExternalPackage_add_file,libcdr,lib/libcdr-0.0.a,src/lib/.libs/libcdr-0.0.a))
endif
# vim: set noet sw=4 ts=4:
libcdr/ExternalProject_libcdr.mk
0 → 100644
Dosyayı görüntüle @
b8f39c5c
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_ExternalProject_ExternalProject,libcdr))
$(eval $(call gb_ExternalProject_use_unpacked,libcdr,cdr))
$(eval $(call gb_ExternalProject_register_targets,libcdr,\
build \
))
$(eval $(call gb_ExternalProject_use_externals,cdrlib,\
lcms2 \
wpd \
wpg \
zlib \
))
ifeq ($(OS)$(COM),WNTMSC)
$(call gb_ExternalProject_get_state_target,libcdr,build) :
cd $(EXTERNAL_WORKDIR)/build/win32 \
&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export LCMS2_INCLUDE_DIR=$(OUTDIR)/inc/lcms2 \
&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
&& $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj "Release|Win32" \
&& touch $@
else
libcdr_cflags :=
libcdr_libs :=
ifeq ($(SYSTEM_LIBWPD),YES)
libcdr_cflags += $(WPD_CFLAGS)
libcdr_libs += $(WPD_LIBS)
else # !SYSTEM_LIBWPD
libcdr_cflags += -I$(OUTDIR)/inc/external
libcdr_libs += $(SOLARLIB)
endif # SYSTEM_LIBWPD
ifeq ($(SYSTEM_LIBWPG),YES)
libcdr_cflags += $(WPG_CFLAGS)
libcdr_libs += $(WPG_LIBS)
else # !SYSTEM_LIBWPG
libcdr_cflags += -I$(OUTDIR)/inc/external
libcdr_libs += $(SOLARLIB)
endif # SYSTEM_LIBWPG
ifeq ($(SYSTEM_LCMS2),YES)
else # !SYSTEM_LCMS2
libcdr_cflags += -I$(OUTDIR)/inc/lcms2
libcdr_libs += $(SOLARLIB)
endif # SYSTEM_LCMS2
zlib_cflags :=
zlib_libs :=
ifneq ($(SYSTEM_ZLIB),YES)
zlib_cflags += -I$(OUTDIR)/inc/external/zlib
zlib_libs += $(SOLARLIB)
endif # !SYSTEM_ZLIB
$(call gb_ExternalProject_get_state_target,libcdr,build) :
cd $(EXTERNAL_WORKDIR) \
&& PKG_CONFIG="" \
LIBCDR_CFLAGS="$(libcdr_cflags)" \
LIBCDR_LIBS="$(libcdr_libs)" \
ZLIB_CFLAGS="$(zlib_cflags)" \
ZLIB_LIBS="$(zlib_libs)" \
./configure \
--with-pic \
--enable-static \
--disable-shared \
--without-docs \
--disable-debug \
--disable-werror \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(GNUMAKE) -j$(EXTMAXPROCESS)) \
&& touch $@
endif
# vim: set noet sw=4 ts=4:
libcdr/Module_libcdr.mk
Dosyayı görüntüle @
b8f39c5c
...
...
@@ -13,7 +13,7 @@ ifeq ($(SYSTEM_LIBCDR),NO)
$(eval $(call gb_Module_add_targets,libcdr,\
ExternalPackage_libcdr \
StaticLibrary_
cdr \
ExternalProject_lib
cdr \
UnpackedTarball_cdr \
))
...
...
libcdr/StaticLibrary_cdr.mk
deleted
100644 → 0
Dosyayı görüntüle @
8f6d8d47
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_StaticLibrary_StaticLibrary,cdrlib))
$(eval $(call gb_StaticLibrary_use_unpacked,cdrlib,cdr))
$(eval $(call gb_StaticLibrary_use_package,cdrlib,libcdr_inc))
$(eval $(call gb_StaticLibrary_use_externals,cdrlib,\
lcms2 \
wpd \
wpg \
zlib \
))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,cdrlib))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,cdrlib,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,cdrlib,\
UnpackedTarball/cdr/src/lib/CDRCollector \
UnpackedTarball/cdr/src/lib/CDRContentCollector \
UnpackedTarball/cdr/src/lib/CDRDocument \
UnpackedTarball/cdr/src/lib/CDRInternalStream \
UnpackedTarball/cdr/src/lib/CDROutputElementList \
UnpackedTarball/cdr/src/lib/CDRParser \
UnpackedTarball/cdr/src/lib/CDRPath \
UnpackedTarball/cdr/src/lib/CDRStringVector \
UnpackedTarball/cdr/src/lib/CDRStylesCollector \
UnpackedTarball/cdr/src/lib/CDRSVGGenerator \
UnpackedTarball/cdr/src/lib/CDRTypes \
UnpackedTarball/cdr/src/lib/CDRZipStream \
UnpackedTarball/cdr/src/lib/CMXDocument \
UnpackedTarball/cdr/src/lib/CMXParser \
UnpackedTarball/cdr/src/lib/CommonParser \
UnpackedTarball/cdr/src/lib/libcdr_utils \
))
# 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