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
d3f62f19
Kaydet (Commit)
d3f62f19
authored
Mar 15, 2013
tarafından
Peter Foley
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
move libmspub to gcc-wrapper
Change-Id: I44f1e53411e273575ebb97bf19c8a7a3ad2c313c
üst
ca05c3a2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
40 deletions
+4
-40
ExternalPackage_libmspub.mk
libmspub/ExternalPackage_libmspub.mk
+2
-2
ExternalProject_libmspub.mk
libmspub/ExternalProject_libmspub.mk
+2
-38
No files found.
libmspub/ExternalPackage_libmspub.mk
Dosyayı görüntüle @
d3f62f19
...
...
@@ -17,8 +17,8 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub,inc/external/libmsp
$(eval $(call gb_ExternalPackage_use_external_project,libmspub,libmspub))
ifeq ($(
OS)$(COM),WNT
MSC)
$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/mspub-0.0.lib,
build/win32/Release/lib
/libmspub-0.0.lib))
ifeq ($(
COM),
MSC)
$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/mspub-0.0.lib,
src/lib/.libs
/libmspub-0.0.lib))
else
$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/libmspub-0.0.a,src/lib/.libs/libmspub-0.0.a))
endif
...
...
libmspub/ExternalProject_libmspub.mk
Dosyayı görüntüle @
d3f62f19
...
...
@@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,libmspub))
$(eval $(call gb_ExternalProject_use_unpacked,libmspub,mspub))
$(eval $(call gb_ExternalProject_use_autoconf,libmspub,build))
$(eval $(call gb_ExternalProject_register_targets,libmspub,\
build \
))
...
...
@@ -22,42 +24,6 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\
wpg \
))
ifeq ($(OS)$(COM),WNTMSC)
ifeq ($(VCVER),90)
$(call gb_ExternalProject_get_state_target,libmspub,build) :
$(call gb_ExternalProject_run,build,\
export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
&& export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& $(COMPATH)/vcpackages/vcbuild.exe libmspub.vcproj "Release|Win32" \
,build/win32)
else ifeq ($(VCVER),100)
$(call gb_ExternalProject_get_state_target,libmspub,build) :
$(call gb_ExternalProject_run,build,\
export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
&& export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& msbuild.exe libmspub.vcxproj /p:Configuration=Release \
,build/win32)
else
$(call gb_ExternalProject_get_state_target,libmspub,build) :
$(call gb_ExternalProject_run,build,\
export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
&& export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& msbuild.exe libmspub.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \
,build/win32)
endif
else
$(call gb_ExternalProject_get_state_target,libmspub,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
...
...
@@ -77,6 +43,4 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
)
endif
# 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