[Libreoffice-commits] .: 2 commits - solenv/gbuild starmath/CppunitTest_starmath_qa_cppunit.mk

[David Tardon]

 solenv/gbuild/StaticLibrary.mk              |    1 +
 starmath/CppunitTest_starmath_qa_cppunit.mk |   11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit ddf8a35d9572f4fe9ab6d86b79aba74ad077fe33
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 19:34:40 2012 +0200

    add gb_StaticLibrary_set_x64
    
    Change-Id: Id54050f483aabf3514e4dd122ef295c6f1135fe4

diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 672478e..8458319 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -106,6 +106,7 @@ $(eval $(foreach method,\
 	set_include \
 	add_ldflags \
 	set_ldflags \
+	set_x64 \
 	add_libs \
 	set_library_path_flags \
 	add_api \
commit 96a32c111538f8387934fa7e556f98bbd9f10620
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 19:09:36 2012 +0200

    fix .component paths
    
    Change-Id: I953cdd6f425245aff0d18858d201520938e0e3aa

diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index d8ecc78..356a916 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_CppunitTest_use_ure,starmath_qa_cppunit))
 
 $(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
     configmgr/source/configmgr \
+    dtrans/util/mcnttype \
     framework/util/fwk \
     i18npool/util/i18npool \
     toolkit/util/tk \
@@ -86,14 +87,10 @@ $(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
     vcl/vcl \
 ))
 
-$(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\
-    mcnttype \
-))
-
 ifeq ($(strip $(OS)),WNT)
-$(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\
-    ftransl \
-    sysdtrans \
+$(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
+    dtrans/util/ftransl \
+    dtrans/util/sysdtrans \
 ))
 endif