[Libreoffice-commits] core.git: solenv/gbuild

David Tardon dtardon at redhat.com
Tue Apr 16 11:40:01 PDT 2013


 solenv/gbuild/platform/WNT_INTEL_GCC.mk |    2 +-
 solenv/gbuild/platform/com_MSC_class.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eda61605d1843a87fc67039fa73be616040b581d
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 16 20:39:36 2013 +0200

    fix path for shlinfo.rc for WinResTarget
    
    Change-Id: If70bdfc3eed5f9873c95404d0d1f5723b0e51140

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index ce4b1b7..7b26863 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -273,7 +273,7 @@ endef
 
 define gb_Library_add_default_nativeres
 $(call gb_WinResTarget_WinResTarget_init,$(2))
-$(call gb_WinResTarget_set_rcfile,$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_rcfile,$(2),include/shlinfo)
 $(call gb_WinResTarget_add_defs,$(2),\
 		-DVERVARIANT="$(LIBO_VERSION_PATCH)" \
 		-DRES_APP_VENDOR="$(OOO_VENDOR)" \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 3f41f1f..d56801f 100755
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -330,7 +330,7 @@ endef
 
 define gb_Library_add_default_nativeres
 $(call gb_WinResTarget_WinResTarget_init,$(2))
-$(call gb_WinResTarget_set_rcfile,$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_rcfile,$(2),include/shlinfo)
 $(call gb_WinResTarget_add_defs,$(2),\
 		-DVERVARIANT="$(LIBO_VERSION_PATCH)" \
 		-DRES_APP_VENDOR="$(OOO_VENDOR)" \


More information about the Libreoffice-commits mailing list