diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-03-05 21:36:01 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-03-05 22:30:10 +0200 |
| commit | b69285590d704b08852c22dbb5ed073bff9998ce (patch) | |
| tree | 5e27b3fb6a9ec04ef5d7c4250fa5552e554c11ed /basic | |
| parent | 07eb8bdcdf0f75a36f5e22a825102070e1255240 (diff) | |
Change my mind again: Do build a subset sb library even for DISABLE_SCRIPTING
The tables functionality in Writer documents need SbxValue.
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/Library_sb.mk | 15 | ||||
| -rw-r--r-- | basic/Module_basic.mk | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 017168278608..4ba93cb1531e 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -64,6 +64,8 @@ $(eval $(call gb_Library_add_linked_libs,sb,\ $(gb_STDLIBS) \ )) +ifneq ($(DISABLE_SCRIPTING),TRUE) + $(eval $(call gb_Library_add_exception_objects,sb,\ basic/source/basmgr/basicmanagerrepository \ basic/source/basmgr/basmgr \ @@ -102,8 +104,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ basic/source/runtime/ddectrl \ basic/source/runtime/inputbox \ basic/source/runtime/iosys \ - basic/source/runtime/methods \ - basic/source/runtime/methods1 \ basic/source/runtime/props \ basic/source/runtime/runtime \ basic/source/runtime/sbdiagnose \ @@ -112,13 +112,21 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ basic/source/runtime/step0 \ basic/source/runtime/step1 \ basic/source/runtime/step2 \ + basic/source/sbx/sbxmstrm \ +)) + +endif + +$(eval $(call gb_Library_add_exception_objects,sb,\ + basic/source/runtime/methods \ + basic/source/runtime/methods1 \ basic/source/sbx/sbxarray \ - basic/source/sbx/sbxbase \ basic/source/sbx/sbxbool \ basic/source/sbx/sbxbyte \ basic/source/sbx/sbxchar \ basic/source/sbx/sbxcoll \ basic/source/sbx/sbxcurr \ + basic/source/sbx/sbxbase \ basic/source/sbx/sbxdate \ basic/source/sbx/sbxdbl \ basic/source/sbx/sbxdec \ @@ -126,7 +134,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ basic/source/sbx/sbxform \ basic/source/sbx/sbxint \ basic/source/sbx/sbxlng \ - basic/source/sbx/sbxmstrm \ basic/source/sbx/sbxobj \ basic/source/sbx/sbxres \ basic/source/sbx/sbxscan \ diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk index bbd9b6124e24..c3ba0ee72581 100644 --- a/basic/Module_basic.mk +++ b/basic/Module_basic.mk @@ -32,7 +32,6 @@ ifneq ($(DISABLE_SCRIPTING),TRUE) $(eval $(call gb_Module_add_targets,basic,\ AllLangResTarget_sb \ - Library_sb \ )) $(eval $(call gb_Module_add_check_targets,basic,\ @@ -42,6 +41,7 @@ $(eval $(call gb_Module_add_check_targets,basic,\ endif $(eval $(call gb_Module_add_targets,basic,\ + Library_sb \ Package_inc \ )) |