diff options
| author | Andras Timar <atimar@suse.com> | 2011-11-21 10:05:00 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-11-21 10:05:20 +0100 |
| commit | 37676d162c29331c9f6235cf51406db8aaf8dfba (patch) | |
| tree | f97cec972ae243eefe3bddc3024a7c7f7994c788 | |
| parent | 5fc21e87b9bcc55a542c4e675f4b78cc578026d1 (diff) | |
only one launcher icon for silent MSI
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | scp2/source/base/folderitem_base.scp | 2 | ||||
| -rw-r--r-- | scp2/source/calc/folderitem_calc.scp | 2 | ||||
| -rw-r--r-- | scp2/source/draw/folderitem_draw.scp | 2 | ||||
| -rw-r--r-- | scp2/source/impress/folderitem_impress.scp | 2 | ||||
| -rw-r--r-- | scp2/source/math/folderitem_math.scp | 2 | ||||
| -rw-r--r-- | scp2/source/writer/folderitem_writer.scp | 2 |
7 files changed, 13 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 49d3b8edc2eb..eebcc78f2230 100644 --- a/configure.in +++ b/configure.in @@ -8468,6 +8468,7 @@ if test "z$enable_silent_msi" = "z" -o "z$enable_silent_msi" = "zno" ; then else AC_MSG_RESULT([yes]) ENABLE_SILENT_MSI="TRUE" + SCPDEFS="$SCPDEFS -DENABLE_SILENT_MSI" fi AC_SUBST(ENABLE_SILENT_MSI) diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index 671bd9324866..c21c2a8c8c0c 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -27,6 +27,7 @@ #include "macros.inc" +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sbase Name = "%PRODUCTNAME Base"; ModuleID = gid_Module_Prg_Base_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Sbase Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE); End +#endif diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index 782d135a0f8e..f77258ae7112 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -27,6 +27,7 @@ #include "macros.inc" +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Scalc Name = "%PRODUCTNAME Calc"; ModuleID = gid_Module_Prg_Calc_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Scalc Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC); End +#endif diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp index a07f710867cf..1fe1de25a8f1 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/scp2/source/draw/folderitem_draw.scp @@ -27,6 +27,7 @@ #include "macros.inc" +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sdraw Name = "%PRODUCTNAME Draw"; ModuleID = gid_Module_Prg_Draw_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Sdraw Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW); End +#endif diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index 98954f17a3ec..31c56ad6a3d6 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -27,6 +27,7 @@ #include "macros.inc" +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Simpress Name = "%PRODUCTNAME Impress"; ModuleID = gid_Module_Prg_Impress_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Simpress Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS); End +#endif diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index 609de29f3abd..3ad3b07a24e1 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/scp2/source/math/folderitem_math.scp @@ -27,6 +27,7 @@ #include "macros.inc" +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Smath Name = "%PRODUCTNAME Math"; ModuleID = gid_Module_Prg_Math_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Smath Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH); End +#endif diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp index 1fe448d61a10..946ae6530277 100644 --- a/scp2/source/writer/folderitem_writer.scp +++ b/scp2/source/writer/folderitem_writer.scp @@ -27,6 +27,7 @@ #include "macros.inc" +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Swriter Name = "%PRODUCTNAME Writer"; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Swriter Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER); End +#endif |