From 5d5950a766311cac4c851744c6622f8ac525975f Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 13 May 2013 17:52:18 +0100 Subject: gallery: convert text-shapes to new build logic. Change-Id: Ia45a2eed7104b376b92290e1a40219e8988d927b --- scp2/inc/macros.inc | 14 ++++++++++++-- scp2/source/ooo/file_extra_ooo.scp | 15 ++------------- 2 files changed, 14 insertions(+), 15 deletions(-) (limited to 'scp2') diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 405da24c6c2f..3b0bcce86448 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -285,7 +285,7 @@ End Value = STRING(CONCAT2(LibreOffice.,name)); \ Styles = (); \ End - + #define REGISTRY_ENTRY_KINDMAP(name, modid, key) \ RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Explorer_KindMap_,name) \ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ @@ -422,5 +422,15 @@ End Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \ End -#endif // MACROS_INC +#define GALLERY_NAME(id) \ + +#define GALLERY_FILELIST(id) \ +File gid_File_Extra_Gall##id \ + Dir = FILELIST_DIR; \ + TXT_FILE_BODY; \ + Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \ + Name = STRING(CONCAT3(Gallery/,id,.filelist)); \ +End + +#endif // MACROS_INC diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 1ec4e9fea42f..feb17f9c240a 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -224,19 +224,8 @@ File gid_File_Extra_Galltransport Name = "extras_galltransport.filelist"; End -File gid_File_Extra_Galltxtshapes - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "extras_galltxtshapes.filelist"; -End - -File gid_File_Extra_Gallsound - Dir = FILELIST_DIR; - USER_FILE_BODY; - Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); - Name = "Gallery/sound.filelist"; -End +GALLERY_FILELIST(txtshapes) +GALLERY_FILELIST(sound) File gid_File_Extra_Gallmytheme Dir = FILELIST_DIR; -- cgit v1.2.3