diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-02 12:34:47 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-02 16:34:53 +0200 |
| commit | f8de1df4be6c97f279dd344ef14e2967d848bd32 (patch) | |
| tree | a5ea4f6f0e5a8c660cc5c4e7c506ea17892d617d /scp2/inc | |
| parent | fbed35762a6b14e8fda5179e320a9c30fd426454 (diff) | |
scp2: move fonts to AutoInstall
Add new PACKAGE_FILELIST_FONT
The DONT_DELETE style has no effect for files.
The FONT_WARN_IF_EXISTS style has no effect.
Change-Id: Id062ada0a680341c01827e457b1166d625afe8cc
Diffstat (limited to 'scp2/inc')
| -rw-r--r-- | scp2/inc/macros.inc | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index d55084c8bcdb..fc17096b7f48 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -120,6 +120,17 @@ File id \ Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \ End +#ifdef WNT +#define PACKAGE_FILELIST_FONT(id,name) \ +File id \ + Dir = FILELIST_DIR; \ + Name = name; \ + Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED, FONT); \ +End +#else +#define PACKAGE_FILELIST_FONT PACKAGE_FILELIST +#endif // WNT + #define SDK_PACKAGE_FILELIST(id,name) \ File id \ Dir = FILELIST_SDK_DIR; \ @@ -199,26 +210,6 @@ End Styles = (PACKED); \ End -#ifdef UNX -#define STD_FONT_FILELIST(id,name) \ - File id \ - TXT_FILE_BODY; \ - Dir = FILELIST_DIR; \ - Styles = (FILELIST, PACKED, FONT_WARN_IF_EXISTS); \ - Name = name; \ - End -#endif - -#ifdef WNT -#define STD_FONT_FILELIST(id,name) \ - File id \ - TXT_FILE_BODY; \ - Dir = FILELIST_DIR; \ - Styles = (FILELIST,PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \ - Name = name; \ - End -#endif - #define LIBO_JAR_FILE(id,name) \ File id \ TXT_FILE_BODY; \ |