diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-09-07 18:42:27 -0400 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-07 10:42:19 +0200 |
| commit | a97fdbda6b568d776e04e27dda7c26d33b88c8c5 (patch) | |
| tree | 0a5e9ed193a92c3556bc5ec6d6ca3cb3e7ab2dc8 /liborcus | |
| parent | 2db6f67b6e006cfcc6569306eef40f9cafdec798 (diff) | |
fix liborcus build with VS2012
Change-Id: I98248b2fe45da32fc0f478aee55b6939825112f7
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index f67b48c64063..3882971bfc2a 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -17,13 +17,23 @@ $(eval $(call gb_ExternalProject_register_targets,liborcus,\ ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(CCNUMVER),90) $(call gb_ExternalProject_get_state_target,liborcus,build) : cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export BOOST_LIB_DIR=$(OUTDIR)/lib \ && $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \ && touch $@ - +else +$(call gb_ExternalProject_get_state_target,liborcus,build) : + cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ + && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export BOOST_LIB_DIR=$(OUTDIR)/lib \ + && $(COMPATH)/../Common7/Tools/vcupgrade.exe liborcus-static-nozip.vcproj \ + && MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release /p:TargetName=orcus /p:WholeProgramOptimization=no \ + && touch $@ +endif + else $(call gb_ExternalProject_get_state_target,liborcus,build) : |