diff options
| -rw-r--r-- | libwpd/ExternalProject_libwpd.mk | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk index 16ddad5bf2d0..f91314a34f4a 100644 --- a/libwpd/ExternalProject_libwpd.mk +++ b/libwpd/ExternalProject_libwpd.mk @@ -17,11 +17,22 @@ $(eval $(call gb_ExternalProject_register_targets,libwpd,\ ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(CCNUMVER),90) $(call gb_ExternalProject_get_state_target,libwpd,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ && $(COMPATH)/vcpackages/vcbuild.exe libwpd.vcproj "Release|Win32" \ && touch $@ - +else ifeq ($(CCNUMVER),100) +$(call gb_ExternalProject_get_state_target,libwpd,build) : + cd $(EXTERNAL_WORKDIR)/build/win32 \ + && msbuild.exe libwpd.vcxproj \ + && touch $@ +else +$(call gb_ExternalProject_get_state_target,libwpd,build) : + cd $(EXTERNAL_WORKDIR)/build/win32 \ + && msbuild.exe libwpd.vcxproj /p:PlatformToolset=v110 /p:TargetName=libwpd-0.9 /p:Configuration=Release \ + && touch $@ +endif else $(call gb_ExternalProject_get_state_target,libwpd,build) : |