diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-28 23:57:21 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-29 11:37:50 +0100 |
| commit | 3ba20ef5ff0bce21da706815e8dca911b24b688b (patch) | |
| tree | 13ccfcecaa1cbe509fce44200a094d8a59602ed7 /scp2 | |
| parent | 557f58d1cfac2d602c3cc74927eea9e771fe5d67 (diff) | |
scp2: move impress executables to AutoInstall
Change-Id: I312a9921e8760ee93282ef0706469fdea3fabea9
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_impress.mk | 1 | ||||
| -rw-r--r-- | scp2/source/impress/file_impress.scp | 4 | ||||
| -rw-r--r-- | scp2/source/impress/folderitem_impress.scp | 4 | ||||
| -rw-r--r-- | scp2/source/impress/module_impress.scp | 3 |
5 files changed, 8 insertions, 5 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 1bad46f3aab1..23d56a06b07b 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -24,6 +24,7 @@ $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,impress_brand,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE)) diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk index 95b4965a73cb..0f10c9ddb420 100644 --- a/scp2/InstallModule_impress.mk +++ b/scp2/InstallModule_impress.mk @@ -11,6 +11,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/impress)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,\ impress \ + impress_brand \ ogltrans \ )) diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index 7cf3eb57bf75..5cb4126fc4b9 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -33,11 +33,11 @@ File gid_File_Help_Simpress_Zip End #endif -#ifndef MACOSX +#if !defined MACOSX && !defined WNT File gid_File_Exe_Simpress BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; - Name = EXENAME(simpress); + Name = "simpress"; Styles = (PACKED); End #endif diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index 44adbbe73796..c35221b533b4 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -23,8 +23,8 @@ FolderItem gid_Folderitem_Simpress Name = "%PRODUCTNAME Impress"; ModuleID = gid_Module_Prg_Impress_Bin; FolderID = gid_Folder_Staroffice51; - FileID = gid_File_Exe_Simpress; - IconFile = gid_File_Exe_Simpress; + FileID = auto_impress_brand_exe_simpress; + IconFile = auto_impress_brand_exe_simpress; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ""; diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index dd2eeba04edf..38e445f40003 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -19,6 +19,7 @@ #include "macros.inc" #include "AutoInstall/impress" +#include "AutoInstall/impress_brand" Module gid_Module_Prg_Impress MOD_NAME_DESC ( MODULE_PRG_IMPRESS ); @@ -52,7 +53,7 @@ Module gid_Module_Brand_Prg_Impress Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Exe_Simpress); + Files = (auto_impress_brand_ALL,gid_File_Exe_Simpress); End Module gid_Module_Langpack_Impress_Template |