summaryrefslogtreecommitdiff
path: root/jurt
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-12-02 18:12:54 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-12-03 15:19:55 +0100
commit827430c8c0417396b3c1d2a049ccddb818c89646 (patch)
tree2b249c14dcbfb725469b4dd70c125d00486d2a84 /jurt
parent1924d05e706e6308b4de3b6103ebb73976866d66 (diff)
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 'jurt')
-rw-r--r--jurt/Jar_jurt.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk
index 710e8186607c..70dae3bced4e 100644
--- a/jurt/Jar_jurt.mk
+++ b/jurt/Jar_jurt.mk
@@ -21,8 +21,7 @@ $(eval $(call gb_Jar_set_manifest,jurt,$(SRCDIR)/jurt/util/manifest))
$(eval $(call gb_Jar_add_manifest_classpath,jurt, \
ridl.jar \
unoloader.jar \
- $(if $(filter MACOSX,$(OS)),../../Frameworks/, \
- $(if $(filter WNT,$(OS)),../bin/,../)) \
+ $(if $(filter MACOSX,$(OS)),../../Frameworks/,../) \
))
$(eval $(call gb_Jar_add_sourcefiles,jurt,\