diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-02 18:12:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-03 15:19:55 +0100 |
| commit | 827430c8c0417396b3c1d2a049ccddb818c89646 (patch) | |
| tree | 2b249c14dcbfb725469b4dd70c125d00486d2a84 /odk/settings | |
| parent | RtfAttributeOutput::NumberingLevel: fix indentation (diff) | |
| download | core-827430c8c0417396b3c1d2a049ccddb818c89646.tar.gz core-827430c8c0417396b3c1d2a049ccddb818c89646.zip | |
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
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 4 |
1 files changed, 1 insertions, 3 deletions
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 |