diff options
| author | Tobias Krause <tkr@openoffice.org> | 2009-11-01 08:02:07 +0000 |
|---|---|---|
| committer | Tobias Krause <tkr@openoffice.org> | 2009-11-01 08:02:07 +0000 |
| commit | e16c0da6e4d71a3da710c59f6fc5c99fec186b43 (patch) | |
| tree | c5b14b4d03c650a733a89effaf5cf6e7d285fc7b /scp2/source/activex | |
| parent | a38261ecdc3cb42721be9ea057b121e10cd00850 (diff) | |
#105892# add new *_x64 libs to instset
Diffstat (limited to 'scp2/source/activex')
| -rw-r--r-- | scp2/source/activex/file_activex.scp | 15 | ||||
| -rw-r--r-- | scp2/source/activex/module_activex.scp | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp index 6a3739f4c832..5f257af2e1b8 100644 --- a/scp2/source/activex/file_activex.scp +++ b/scp2/source/activex/file_activex.scp @@ -37,12 +37,15 @@ File gid_File_Lib_Soactivex Name = "so_activex.dll"; End -File gid_File_Lib_Soactivex_X64 - TXT_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - Name = "so_activex_x64.dll"; -End +#ifdef BUILD_X64 + File gid_File_Lib_Soactivex64 + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + Name = "so_activex_x64.dll"; + ComponentCondition = "VersionNT64"; + End +#endif File gid_File_Lib_Regactivex_Msi TXT_FILE_BODY; diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp index 074e5f36f064..4d39208f5d14 100644 --- a/scp2/source/activex/module_activex.scp +++ b/scp2/source/activex/module_activex.scp @@ -37,5 +37,5 @@ Module gid_Module_Optional_Activexcontrol Default = NO; Minimal = NO; ParentID = gid_Module_Optional; - Files = (gid_File_Lib_Soactivex, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi); + Files = (gid_File_Lib_Soactivex, gid_File_Lib_Soactivex64, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi); End |