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 /javaunohelper | |
| parent | 1924d05e706e6308b4de3b6103ebb73976866d66 (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 'javaunohelper')
| -rw-r--r-- | javaunohelper/Jar_juh.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk index cfd0ec818d89..633a2d8c60f4 100644 --- a/javaunohelper/Jar_juh.mk +++ b/javaunohelper/Jar_juh.mk @@ -19,8 +19,7 @@ $(eval $(call gb_Jar_set_packageroot,juh,com)) $(eval $(call gb_Jar_add_manifest_classpath,juh, \ jurt.jar \ ridl.jar \ - $(if $(filter MACOSX,$(OS)),../../Frameworks/, \ - $(if $(filter WNT,$(OS)),../bin/,../)) \ + $(if $(filter MACOSX,$(OS)),../../Frameworks/,../) \ )) $(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest)) |