diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-09-25 21:38:04 -0400 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-07 10:42:26 +0200 |
| commit | 6691aa36c1cc9175c87b86567b04bc632a09809e (patch) | |
| tree | 6eafc4ed359a19948f2e619689e339f6d6331d8a /libwpd | |
| parent | 1cf215b16fc65e27f3fa333af43bc067f5189f2b (diff) | |
fix libwpd with VS2012
Change-Id: I2df9ab344bb2a934f6408a394280c01563d0c9b8
Diffstat (limited to 'libwpd')
| -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) : |