Skip to content

C
core
Kaydet (Commit) d3f62f19 authored tarafından Peter Foley's avatar Peter Foley
Dosyalara gözat
Seçenekler

move libmspub to gcc-wrapper 

Change-Id: I44f1e53411e273575ebb97bf19c8a7a3ad2c313c
üst ca05c3a2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 40 deletions
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),WNTMSC)
$(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:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment