diff options
Diffstat (limited to 'lcms2/ExternalProject_lcms2.mk')
| -rw-r--r-- | lcms2/ExternalProject_lcms2.mk | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk index da43a43b4c3b..d76049e13462 100644 --- a/lcms2/ExternalProject_lcms2.mk +++ b/lcms2/ExternalProject_lcms2.mk @@ -19,27 +19,27 @@ ifeq ($(COM),MSC) ifeq ($(filter-out 14 13,$(COMEX)),) $(call gb_ExternalProject_get_state_target,lcms2,build): - cd $(EXTERNAL_WORKDIR)/Projects/VC2010/lcms2_DLL \ - && MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 \ - $(if $(filter 14,$(COMEX)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 \ + $(if $(filter 14,$(COMEX)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \ + ,Projects/VC2010/lcms2_DLL) else $(call gb_ExternalProject_get_state_target,lcms2,build): - cd $(EXTERNAL_WORKDIR)/Projects/VC2008/lcms2_DLL \ - && $(COMPATH)/vcpackages/vcbuild.exe lcms2_DLL.vcproj "Release|Win32" \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + $(COMPATH)/vcpackages/vcbuild.exe lcms2_DLL.vcproj "Release|Win32" \ + ,Projects/VC2008/lcms2_DLL) endif else $(call gb_ExternalProject_get_state_target,lcms2,build): - cd $(EXTERNAL_WORKDIR) \ - && ./configure --without-jpeg --without-tiff --with-pic \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - CPPFLAGS=" $(SOLARINC)" \ - $(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \ - $(if $(filter IOS ANDROID,$(OS)), --disable-shared --enable-static, --enable-shared --disable-static) \ - $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - && cd src \ - && $(MAKE) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + ./configure --without-jpeg --without-tiff --with-pic \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + CPPFLAGS=" $(SOLARINC)" \ + $(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \ + $(if $(filter IOS ANDROID,$(OS)), --disable-shared --enable-static, --enable-shared --disable-static) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + && cd src \ + && $(MAKE) \ + ) endif # vim: set noet sw=4 ts=4: |