diff options
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 9de89dabba56..595049ba916e 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : && export BOOST_LIB_DIR=$(OUTDIR)/lib \ && $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \ && touch $@ -else +else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,liborcus,build) : cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ @@ -35,6 +35,14 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : && export BOOST_LIB_DIR=$(OUTDIR)/lib \ && MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ && 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 ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export BOOST_LIB_DIR=$(OUTDIR)/lib \ + && MSBuild.exe liborcus-static-nozip.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ + && touch $@ endif else |