Skip to content

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

move libmwaw to gcc-wrapper 

Change-Id: Icad437f4c5622e1cc631b91ecb20913893514ffc
üst 7abc6baa
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 33 deletions
libmwaw/ExternalPackage_libmwaw.mk
Dosyayı görüntüle @ ca05c3a2
...@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libmwaw,inc/external/libmwaw ...@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libmwaw,inc/external/libmwaw
$(eval $(call gb_ExternalPackage_use_external_project,libmwaw,libmwaw)) $(eval $(call gb_ExternalPackage_use_external_project,libmwaw,libmwaw))
ifeq ($(OS)$(COM),WNTMSC) ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_ExternalPackage_add_file,libmwaw,lib/mwaw-0.1.lib,build/win32/Release/lib/libmwaw-0.1.lib)) $(eval $(call gb_ExternalPackage_add_file,libmwaw,lib/mwaw-0.1.lib,src/lib/.libs/libmwaw-0.1.lib))
else else
$(eval $(call gb_ExternalPackage_add_file,libmwaw,lib/libmwaw-0.1.a,src/lib/.libs/libmwaw-0.1.a)) $(eval $(call gb_ExternalPackage_add_file,libmwaw,lib/libmwaw-0.1.a,src/lib/.libs/libmwaw-0.1.a))
endif endif
......
libmwaw/ExternalProject_libmwaw.mk
Dosyayı görüntüle @ ca05c3a2
...@@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,libmwaw)) ...@@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,libmwaw))
$(eval $(call gb_ExternalProject_use_unpacked,libmwaw,mwaw)) $(eval $(call gb_ExternalProject_use_unpacked,libmwaw,mwaw))
$(eval $(call gb_ExternalProject_use_autoconf,libmwaw,build))
$(eval $(call gb_ExternalProject_register_targets,libmwaw,\ $(eval $(call gb_ExternalProject_register_targets,libmwaw,\
build \ build \
)) ))
...@@ -20,36 +22,6 @@ $(eval $(call gb_ExternalProject_use_externals,libmwaw,\ ...@@ -20,36 +22,6 @@ $(eval $(call gb_ExternalProject_use_externals,libmwaw,\
wpd \ wpd \
)) ))
ifeq ($(OS)$(COM),WNTMSC)
ifeq ($(VCVER),90)
$(call gb_ExternalProject_get_state_target,libmwaw,build) :
$(call gb_ExternalProject_run,build,\
export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
&& $(COMPATH)/vcpackages/vcbuild.exe libmwaw.vcproj "Release|Win32" \
,build/win32)
else ifeq ($(VCVER),100)
$(call gb_ExternalProject_get_state_target,libmwaw,build) :
$(call gb_ExternalProject_run,build,\
export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
&& msbuild.exe libmwaw.vcxproj /p:Configuration=Release \
,build/win32)
else
$(call gb_ExternalProject_get_state_target,libmwaw,build) :
$(call gb_ExternalProject_run,build,\
export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
&& msbuild.exe libmwaw.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \
,build/win32)
endif
else
$(call gb_ExternalProject_get_state_target,libmwaw,build) : $(call gb_ExternalProject_get_state_target,libmwaw,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \ export PKG_CONFIG="" \
...@@ -65,6 +37,4 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) : ...@@ -65,6 +37,4 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
) )
endif
# vim: set noet sw=4 ts=4: # 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