summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorTomas Chvatal <tchvatal@suse.cz>2012-05-06 12:49:33 +0200
committerTomas Chvatal <tchvatal@suse.cz>2012-05-06 12:52:55 +0200
commit32af02b32f1ab7f2683749e6c949470847175da0 (patch)
treeba407c1c7de6d9807f91d5786007498a64c2e388 /scp2
parentb3d63df541ff6b2bf9c77699c8c076ebcde2d6cf (diff)
Allow usage of system rhino wrt fdo#42977
It is done the same way the beanshell is handled. Currently it can't be enabled by default as internal version has patched-in debug interface. We can choose two paths, rewrite the code to the new rhino debug interface or just strip the current one out. Change-Id: I48af18c635816db8269f13a649b62e9c454ee1e6
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/extensions/makefile.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/scp2/source/extensions/makefile.mk b/scp2/source/extensions/makefile.mk
index 77828ca05cc5..b8ee210e5dda 100644
--- a/scp2/source/extensions/makefile.mk
+++ b/scp2/source/extensions/makefile.mk
@@ -41,6 +41,10 @@ TARGETTYPE=CUI
SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\"
.ENDIF
+.IF "$(SYSTEM_RHINO)" == "YES"
+SCPDEFS+=-DSYSTEM_RHINO -DRHINO_JAR=\""file://$(RHINO_JAR)"\"
+.ENDIF
+
SCP_PRODUCT_TYPE=osl
PARFILES= \
module_extensions.par \