fix URE deps

Change-Id: Ifbcd2c7db1985ca8fcc74dbbe74ffb93177d6490

solenv/gbuild/CppunitTest.mk

@@ -156,8 +156,10 @@ endef
 define gb_CppunitTest_use_ure
 $(call gb_CppunitTest_use_rdb,$(1),ure/services)
 $(call gb_CppunitTest_get_target,$(1)) : URE := $(true)
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,unobootstrapprotector)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,unoexceptionprotector)
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,cppuhelper_unorc)
 
 endef
 

solenv/gbuild/platform/WNT_INTEL_MSC.mk

@@ -49,6 +49,8 @@ ifneq ($(origin CXX),default)
 gb_CXX := $(CXX)
 endif
 
+gb_CPPU_ENV := msci
+
 gb_COMPILERDEFS := \
 	-DMSC \
 	-D_CRT_NON_CONFORMING_SWPRINTFS \
@@ -57,7 +59,7 @@ gb_COMPILERDEFS := \
 	-D_MT \
 	-D_DLL \
 	-DBOOST_MEM_FN_ENABLE_CDECL \
-	-DCPPU_ENV=msci \
+	-DCPPU_ENV=$(gb_CPPU_ENV) \
 	-DM1500 \
 
 gb_CPUDEFS := -D_X86_=1

solenv/gbuild/platform/com_GCC_defs.mk

@@ -52,9 +52,11 @@ endif
 
 gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }')
 
+gb_CPPU_ENV := gcc3
+
 gb_COMPILERDEFS := \
 	-D$(COM) \
-	-DCPPU_ENV=gcc3 \
+	-DCPPU_ENV=$(gb_CPPU_ENV) \
 	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
 
 ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE)

testtools/CustomTarget_uno_test.mk

@@ -36,7 +36,9 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
 		$(call gb_Rdb_get_outdir_target,uno_services) \
 		$(call gb_Rdb_get_outdir_target,ure/services) \
 		$(call gb_Executable_get_target_for_build,uno) \
-		$(call gb_InternalUnoApi_get_target,bridgetest)
+		$(call gb_InternalUnoApi_get_target,bridgetest) \
+		$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
+		$(call gb_Package_get_target,cppuhelper_unorc)
 	$(call gb_Helper_abbreviate_dirs,\
 		$(call gb_Executable_get_target_for_build,uno) \
 		-ro $(OUTDIR)/xml/uno_services.rdb \