diff options
Diffstat (limited to 'libcdr')
| -rw-r--r-- | libcdr/ExternalProject_libcdr.mk | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index e1397a6ea436..9bd0cea0ef6e 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -26,54 +26,54 @@ ifeq ($(OS)$(COM),WNTMSC) ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,libcdr,build) : - cd $(EXTERNAL_WORKDIR)/build/win32 \ - && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ - && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj "Release|Win32" \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj "Release|Win32" \ + ,build/win32) else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,libcdr,build) : - cd $(EXTERNAL_WORKDIR)/build/win32 \ - && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ - && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && msbuild.exe libcdr.vcxproj /p:Configuration=Release \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && msbuild.exe libcdr.vcxproj /p:Configuration=Release \ + ,build/win32) else $(call gb_ExternalProject_get_state_target,libcdr,build) : - cd $(EXTERNAL_WORKDIR)/build/win32 \ - && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ - && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && msbuild.exe libcdr.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && msbuild.exe libcdr.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \ + ,build/win32) endif else $(call gb_ExternalProject_get_state_target,libcdr,build) : - cd $(EXTERNAL_WORKDIR) \ - && export PKG_CONFIG="" \ - && export ICU_LIBS=" " \ - $(if $(filter NO,$(SYSTEM_ICU)),&& export ICU_CFLAGS="-I$(OUTDIR)/inc/external") \ - $(if $(filter YES,$(SYSTEM_ICU)),&& export ICU_CFLAGS=" ") \ - && ./configure \ - --with-pic \ - --enable-static \ - --disable-shared \ - --without-docs \ - --disable-debug \ - --disable-werror \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ - && touch $@ + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && export ICU_LIBS=" " \ + $(if $(filter NO,$(SYSTEM_ICU)),&& export ICU_CFLAGS="-I$(OUTDIR)/inc/external") \ + $(if $(filter YES,$(SYSTEM_ICU)),&& export ICU_CFLAGS=" ") \ + && ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --disable-debug \ + --disable-werror \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ + ) endif |