From 827430c8c0417396b3c1d2a049ccddb818c89646 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 2 Dec 2014 18:12:54 +0100
Subject: Fold URE: Windows

...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is
no longer necessary and loading of cppuhelper from the program dir cannot fail
regardless in whatever scenario the cli_cppuhelper library itself is loaded.

Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
---
 odk/settings/settings.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'odk/settings')

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 2169af449184..554ac74b2ab2 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -129,9 +129,7 @@ endif
 
 LINK_JAVA_LIBS=/LIBPATH:"$(OO_SDK_JAVA_HOME)/lib"
 
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)\misc
-endif
+URE_MISC=${OFFICE_PROGRAM_PATH}
 
 # use this for release version
 #EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1100000
-- 
cgit