Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3292 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3292/1 bridge_lib_name is $(gb_CPPU_ENV)_uno Change-Id: I1520d78c378f8c48d65defb22c4c77277bd061f7 --- M Repository.mk M bridges/Library_cpp_uno.mk M solenv/gbuild/platform/WNT_X86_64_MSC.mk 3 files changed, 15 insertions(+), 27 deletions(-) diff --git a/Repository.mk b/Repository.mk index b45782c..53c472d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -430,7 +430,7 @@ affine_uno \ cli_cppuhelper \ cli_uno \ - gcc3_uno \ + $(gb_CPPU_ENV)_uno \ getuid \ java_uno \ jpipe \ @@ -449,8 +449,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ jpipx \ - msci_uno \ - mscx_uno \ )) endif diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 7ce51f5..f7153c3 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -7,17 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(COM),GCC) -bridge_lib_name := gcc3_uno -else ifeq ($(COM),MSC) -ifeq ($(CPU),I) -bridge_lib_name := msci_uno -else ifeq ($(CPU),X) -bridge_lib_name := mscx_uno -endif # COM=WNT -endif - -$(eval $(call gb_Library_Library,$(bridge_lib_name))) +$(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno)) ifeq ($(OS)$(CPU),AIXP) @@ -157,24 +147,24 @@ endif -$(eval $(call gb_Library_use_external,$(bridge_lib_name),boost_headers)) +$(eval $(call gb_Library_use_external,$(gb_CPPU_ENV)_uno,boost_headers)) -$(eval $(call gb_Library_use_internal_comprehensive_api,$(bridge_lib_name),\ +$(eval $(call gb_Library_use_internal_comprehensive_api,$(gb_CPPU_ENV)_uno,\ udkapi \ )) -$(eval $(call gb_Library_set_include,$(bridge_lib_name),\ +$(eval $(call gb_Library_set_include,$(gb_CPPU_ENV)_uno,\ -I$(SRCDIR)/bridges/inc \ $$(INCLUDE) \ )) ifeq ($(HAVE_POSIX_FALLOCATE),YES) -$(eval $(call gb_Library_add_defs,$(bridge_lib_name),\ +$(eval $(call gb_Library_add_defs,$(gb_CPPU_ENV)_uno,\ -DHAVE_POSIX_FALLOCATE \ )) endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_defs,$(bridge_lib_name),\ +$(eval $(call gb_Library_add_defs,$(gb_CPPU_ENV)_uno,\ $(if $(filter GCC,$(COM)),\ $(if $(filter sjlj,$(EXCEPTIONS)),\ -DBROKEN_ALLOCA \ @@ -205,31 +195,31 @@ endif endif -$(eval $(call gb_Library_use_libraries,$(bridge_lib_name),\ +$(eval $(call gb_Library_use_libraries,$(gb_CPPU_ENV)_uno,\ cppu \ sal \ )) $(foreach obj,$(bridge_exception_objects),\ - $(eval $(call gb_Library_add_exception_objects,$(bridge_lib_name),\ + $(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj))) \ ) $(foreach obj,$(bridge_noopt_objects),\ - $(eval $(call gb_Library_add_cxxobjects,$(bridge_lib_name),\ + $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj) \ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS))) \ ) $(foreach obj,$(bridge_cxx_objects),\ - $(eval $(call gb_Library_add_cxxobjects,$(bridge_lib_name),\ + $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj))) \ ) $(foreach obj,$(bridge_asm_objects),\ -$(eval $(call gb_Library_add_asmobjects,$(bridge_lib_name),\ +$(eval $(call gb_Library_add_asmobjects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj))) \ ) -$(eval $(call gb_Library_add_exception_objects,$(bridge_lib_name),\ +$(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/shared/bridge \ bridges/source/cpp_uno/shared/component \ bridges/source/cpp_uno/shared/types \ @@ -238,7 +228,7 @@ bridges/source/cpp_uno/shared/vtables \ )) -$(eval $(call gb_Library_add_cxxobjects,$(bridge_lib_name),\ +$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/shared/cppinterfaceproxy \ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) diff --git a/solenv/gbuild/platform/WNT_X86_64_MSC.mk b/solenv/gbuild/platform/WNT_X86_64_MSC.mk index 7a54dcb..dc6f585 100644 --- a/solenv/gbuild/platform/WNT_X86_64_MSC.mk +++ b/solenv/gbuild/platform/WNT_X86_64_MSC.mk @@ -26,7 +26,7 @@ # #************************************************************************* -gb_CPPU_ENV := msc6 +gb_CPPU_ENV := mscx gb_CPUDEFS := -D_AMD64_=1 include $(GBUILDDIR)/platform/com_MSC_defs.mk -- To view, visit https://gerrit.libreoffice.org/3292 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1520d78c378f8c48d65defb22c4c77277bd061f7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan <matus.ku...@gmail.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice