liborcus/ExternalPackage_liborcus.mk | 4 ++-- liborcus/ExternalProject_liborcus.mk | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-)
New commits: commit a536053e589bd2db02658cf8e9b08f5c3ae24756 Author: Kohei Yoshida <[email protected]> Date: Fri Apr 12 13:26:51 2013 -0400 Go back to using Visual Studio project files to build. gcc-wrapper is too smart for me to figure out. Change-Id: Ia36255035ac0be8ddc6cfc26dac06f3cd1310769 diff --git a/liborcus/ExternalPackage_liborcus.mk b/liborcus/ExternalPackage_liborcus.mk index 8ed7a67..a310e9fe 100644 --- a/liborcus/ExternalPackage_liborcus.mk +++ b/liborcus/ExternalPackage_liborcus.mk @@ -12,8 +12,8 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,orcus)) $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus)) ifeq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/orcus.lib,src/liborcus/.libs/liborcus-0.6.lib)) -$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/orcus-parser.lib,src/parser/.libs/liborcus-parser-0.6.lib)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/orcus.lib,vsprojects/liborcus-static/Release/liborcus-static.lib)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/orcus-parser.lib,vsprojects/liborcus-parser-static/Release/liborcus-parser-static.lib)) else $(eval $(call gb_ExternalPackage_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.6.a)) $(eval $(call gb_ExternalPackage_add_file,liborcus,lib/liborcus-parser.a,src/parser/.libs/liborcus-parser-0.6.a)) diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 5b344455..2d42fff 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -22,6 +22,34 @@ $(eval $(call gb_ExternalProject_register_targets,liborcus,\ build \ )) +ifeq ($(OS)$(COM),WNTMSC) + +ifeq ($(VCVER),90) +$(call gb_ExternalProject_get_state_target,liborcus,build) : + export BOOST_INCLUDE_DIR=$(WORKDIR)/UnpackedTarball/boost \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export BOOST_LIB_DIR=$(OUTDIR)/lib \ + && cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static \ + && $(COMPATH)/vcpackages/vcbuild.exe liborcus-static.vcproj "Release|Win32" \ + && cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-parser-static \ + && $(COMPATH)/vcpackages/vcbuild.exe liborcus-parser-static.vcproj "Release|Win32" \ + && touch $@ +else +$(call gb_ExternalProject_get_state_target,liborcus,build) : + export BOOST_INCLUDE_DIR=$(WORKDIR)/UnpackedTarball/boost \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export BOOST_LIB_DIR=$(OUTDIR)/lib \ + && cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static \ + && $(COMPATH)/../Common7/Tools/vcupgrade.exe liborcus-static.vcproj \ + && MSBuild.exe liborcus-static.vcxproj /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ + && cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-parser-static \ + && $(COMPATH)/../Common7/Tools/vcupgrade.exe liborcus-parser-static.vcproj \ + && MSBuild.exe liborcus-parser-static.vcxproj /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ + && touch $@ +endif + +else + # Must be built with debug GNU C++ library if --enable-dbgutil has # caused the LO code to be built thusly. @@ -51,4 +79,6 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : && $(MAKE) \ ) +endif + # vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
