You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/14 22:59:02 UTC
svn commit: r1409466 - in /incubator/ooo/branches/gbuild/main/solenv/gbuild:
CppunitTest.mk platform/windows.mk
Author: arist
Date: Wed Nov 14 21:59:01 2012
New Revision: 1409466
URL: http://svn.apache.org/viewvc?rev=1409466&view=rev
Log:
writerfilter10_34_73b123a33920.patch
# HG changeset patch
# User Henning Brinkmann <hb...@openoffice.org>
# Date 1301994582 -7200
# Node ID 73b123a3392079acc245343d5c6ffa3107a83b59
# Parent 5795e8cce39cfbae4be4bb234db6496b4d70d8a2
writerfilter10: make CppunitTest run for wntmsci12
Modified:
incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk?rev=1409466&r1=1409465&r2=1409466&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk Wed Nov 14 21:59:01 2012
@@ -55,6 +55,10 @@ endef
define gb_CppunitTest__CppunitTest_impl
$(call gb_LinkTarget_LinkTarget,$(2))
$(call gb_LinkTarget_set_targettype,$(2),CppunitTest)
+$(call gb_LinkTarget_set_defs,$(2),\
+ $$(DEFS) \
+ $(gb_CppunitTest_DEFS) \
+)
$(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
$(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk?rev=1409466&r1=1409465&r2=1409466&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk Wed Nov 14 21:59:01 2012
@@ -620,6 +620,7 @@ endef
# CppunitTest class
+gb_CppunitTest_DEFS := -D_DLL
gb_CppunitTest_CPPTESTPRECOMMAND :=
gb_CppunitTest_SYSPRE := itest_
gb_CppunitTest_EXT := .lib