Skip to content

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

move libwpd to gcc-wrapper 

Change-Id: I4ebe006d0e8850d7229de7a59e424fa819ca7700
üst 2eaf9fd4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 23 deletions
libwpd/ExternalPackage_libwpd.mk
Dosyayı görüntüle @ d956ddc5
......@@ -29,7 +29,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd-s
$(eval $(call gb_ExternalPackage_use_external_project,libwpd,libwpd))
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib))
$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,src/lib/.libs/libwpd-0.9.lib))
else
$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.a,src/lib/.libs/libwpd-0.9.a))
endif
......
libwpd/ExternalProject_libwpd.mk
Dosyayı görüntüle @ d956ddc5
......@@ -11,30 +11,12 @@ $(eval $(call gb_ExternalProject_ExternalProject,libwpd))
$(eval $(call gb_ExternalProject_use_unpacked,libwpd,wpd))
$(eval $(call gb_ExternalProject_use_autoconf,libwpd,build))
$(eval $(call gb_ExternalProject_register_targets,libwpd,\
build \
))
ifeq ($(OS)$(COM),WNTMSC)
ifeq ($(VCVER),90)
$(call gb_ExternalProject_get_state_target,libwpd,build) :
$(call gb_ExternalProject_run,build,\
$(COMPATH)/vcpackages/vcbuild.exe libwpd.vcproj "Release|Win32" \
,build/win32)
else ifeq ($(VCVER),100)
$(call gb_ExternalProject_get_state_target,libwpd,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe libwpd.vcxproj /p:Configuration=Release \
,build/win32)
else
$(call gb_ExternalProject_get_state_target,libwpd,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe libwpd.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:TargetName=libwpd-0.9 /p:Configuration=Release \
,build/win32)
endif
else
$(call gb_ExternalProject_get_state_target,libwpd,build) :
$(call gb_ExternalProject_run,build,\
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \
......@@ -50,6 +32,4 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) :
&& $(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