diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2010-10-07 15:43:06 +0200 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-10-07 15:43:06 +0200 |
commit | e238be67e83f17232c1783d78f68ed3571987533 (patch) | |
tree | 70c5c2653ed216c3ddac91c0a14fa91975af1d30 /scp2/source/activex | |
parent | ae345f8826578cffdf62c6ea670a1bb0412011ff (diff) |
win32-activex-disable.diff: add option to disable build of activex component
Diffstat (limited to 'scp2/source/activex')
-rw-r--r-- | scp2/source/activex/file_activex.scp | 3 | ||||
-rw-r--r-- | scp2/source/activex/module_activex.scp | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp index 574657b5b441..db9b028def62 100644 --- a/scp2/source/activex/file_activex.scp +++ b/scp2/source/activex/file_activex.scp @@ -27,6 +27,8 @@ #include "macros.inc" +#ifdef WITH_ACTIVEX_COMPONENT + File gid_File_Lib_Soactivex TXT_FILE_BODY; Styles = (PACKED); @@ -58,3 +60,4 @@ File gid_File_Lib_Regpatchactivex_Msi Name = "regpatchactivex.dll"; End +#endif // WITH_ACTIVEX_COMPONENT diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp index 808afa874992..aaac49d8012d 100644 --- a/scp2/source/activex/module_activex.scp +++ b/scp2/source/activex/module_activex.scp @@ -27,6 +27,8 @@ #include "macros.inc" +#ifdef WITH_ACTIVEX_COMPONENT + Module gid_Module_Optional_Activexcontrol PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC ( MODULE_OPTIONAL_ACTIVEXCONTROL ); @@ -36,3 +38,5 @@ Module gid_Module_Optional_Activexcontrol ParentID = gid_Module_Optional; Files = (gid_File_Lib_Soactivex, gid_File_Lib_Soactivex64, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi); End + +#endif // WITH_ACTIVEX_COMPONENT |