diff options
author | Andras Timar <atimar@suse.com> | 2011-07-17 14:28:23 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2011-07-17 14:30:52 +0200 |
commit | a2568d4e9984c1bfd64c3a96590c13c283c28f19 (patch) | |
tree | f59d0f560d24649b5136b890b72259b3f2b86770 /scp2 | |
parent | Bin OLDNAMESLIB which duplicates the existing gb_Library_win32_OLDNAMES (diff) | |
download | core-a2568d4e9984c1bfd64c3a96590c13c283c28f19.tar.gz core-a2568d4e9984c1bfd64c3a96590c13c283c28f19.zip |
pack binfilter resources together with other binfilter files
Diffstat (limited to 'scp2')
-rwxr-xr-x | scp2/inc/macros.inc | 8 | ||||
-rw-r--r-- | scp2/source/binfilter/file_binfilter.scp | 21 | ||||
-rw-r--r-- | scp2/source/binfilter/module_binfilter.scp | 32 |
3 files changed, 29 insertions, 32 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 38fbd9610934..677bf2843386 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -186,6 +186,14 @@ Styles = (PACKED); \ End +#define BINFILTER_RES_FILE(id,name) \ + File id \ + TXT_FILE_BODY; \ + Name = STRING(CONCAT3(name,en-US,.res)); \ + Dir = gid_Dir_Resource; \ + Styles = (PACKED); \ + End + #define BRAND_RES_FILE(id,name) \ File id \ TXT_FILE_BODY; \ diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp index 951caadf69fb..140a430afd2e 100644 --- a/scp2/source/binfilter/file_binfilter.scp +++ b/scp2/source/binfilter/file_binfilter.scp @@ -58,17 +58,16 @@ STD_LIB_FILE( gid_File_Lib_Bf_Sm, bf_sm) STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw) STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper) STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters) - +STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so) STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter) STD_LIB_FILE( gid_File_Lib_Bindet, bindet) -STD_RES_FILE( gid_File_Res_Bf_Sch, bf_sch ) -STD_RES_FILE( gid_File_Res_Bf_Svx, bf_svx ) -STD_RES_FILE( gid_File_Res_Bf_Svt, bf_svt ) -STD_RES_FILE( gid_File_Res_Bf_Frm, bf_frm ) -STD_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa ) -STD_RES_FILE( gid_File_Res_Bf_Sc, bf_sc ) -STD_RES_FILE( gid_File_Res_Bf_Sd, bf_sd ) -STD_RES_FILE( gid_File_Res_Bf_Sm, bf_sm) -STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so) -STD_RES_FILE( gid_File_Res_Bf_Sw, bf_sw ) +BINFILTER_RES_FILE( gid_File_Res_Bf_Sch, bf_sch ) +BINFILTER_RES_FILE( gid_File_Res_Bf_Svx, bf_svx ) +BINFILTER_RES_FILE( gid_File_Res_Bf_Svt, bf_svt ) +BINFILTER_RES_FILE( gid_File_Res_Bf_Frm, bf_frm ) +BINFILTER_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa ) +BINFILTER_RES_FILE( gid_File_Res_Bf_Sc, bf_sc ) +BINFILTER_RES_FILE( gid_File_Res_Bf_Sd, bf_sd ) +BINFILTER_RES_FILE( gid_File_Res_Bf_Sm, bf_sm) +BINFILTER_RES_FILE( gid_File_Res_Bf_Sw, bf_sw ) diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp index 4857ecf3804b..873652e6e16a 100644 --- a/scp2/source/binfilter/module_binfilter.scp +++ b/scp2/source/binfilter/module_binfilter.scp @@ -53,25 +53,15 @@ Module gid_Module_Optional_Binfilter gid_File_Lib_Bf_Wrapper, gid_File_Lib_Legacy_Binfilters, gid_File_Lib_Bf_Migratefilter, - gid_File_Lib_Bindet); + gid_File_Lib_Bindet, + gid_File_Res_Bf_Sch, + gid_File_Res_Bf_Svx, + gid_File_Res_Bf_Svt, + gid_File_Res_Bf_Frm, + gid_File_Res_Bf_Ofa, + gid_File_Res_Bf_Sc, + gid_File_Res_Bf_Sd, + gid_File_Res_Bf_Sm, + gid_File_Res_Bf_Sw, + gid_File_Res_Bf_Sfx); End - -Module gid_Module_Langpack_Binfilter_Template - ParentID = gid_Module_Optional_Binfilter; - Name = "gid_Module_Langpack_Binfilter_Template"; - Description = "gid_Module_Langpack_Binfilter_Template"; - Default = YES; - Styles = (TEMPLATEMODULE); - Files = (gid_File_Res_Bf_Sch, - gid_File_Res_Bf_Svx, - gid_File_Res_Bf_Svt, - gid_File_Res_Bf_Frm, - gid_File_Res_Bf_Ofa, - gid_File_Res_Bf_Sc, - gid_File_Res_Bf_Sd, - gid_File_Res_Bf_Sm, - gid_File_Res_Bf_Sw, - gid_File_Res_Bf_Sfx); -End - -#include "alllangmodules_binfilter.inc" |