From 00240d049790d11c4ef35de7a294819107197efd Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sun, 1 Jul 2012 18:24:05 +0200 Subject: Remove unused defines Change-Id: Ic36b131ee9964a6671f7f41e1cad1631c43ad565 --- scp2/inc/macros.inc | 113 ---------------------------------------------------- 1 file changed, 113 deletions(-) (limited to 'scp2') diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 893e675e3ad8..59826686e362 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -27,32 +27,12 @@ ALL_LANG(Name,STR_NAME_##id); \ ALL_LANG(Description,STR_DESC_##id) -#define MOD_NAME_DESC_ON_DESELECT(id) \ - MOD_NAME_DESC(id); \ - ALL_LANG(OnDeselect,STR_DESELECT_##id) - #define REG_VALUE_LNG(id) \ ALL_LANG(Value,STR_REG_VAL_##id); -#define FOLDERITEM_NAME_LNG(id) \ - ALL_LANG(Name,STR_FI_NAME_##id); - -#define ALL_LANG_STR_KEY(ident) \ - ALL_LANG(Key,ident) - -#define ALL_LANG_STR_KEY_LNG(ident) \ - ALL_LANG(Key,STR_KEY_##ident) - #define ALL_LANG_STR_VALUE_LNG(ident) \ ALL_LANG(Value,STR_VALUE_##ident) -#define ALL_LANG_VALUE(vident) \ - ALL_LANG(Value,vident) - -#define ALL_LANG_KEY(vident) \ - ALL_LANG(Key,vident) - - #ifdef UNX #ifdef MACOSX #define UNXSUFFIX .dylib @@ -81,7 +61,6 @@ #define SHORTRESFILENAME(name,lang) STRING(CONCAT3(name,lang,.res)) #define READMETXTFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext)) #define READMEFILENAME(name,lang) STRING(CONCAT2(name,lang)) -#define HELPFILENAME(name,endung) STRING(CONCAT3(name,.,endung)) #define EXTRAFILENAME(name,lang) STRING(CONCAT3(name,lang,.zip)) #define CONFIGLANGFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext)) @@ -103,18 +82,10 @@ TXT_FILE_BODY; \ Styles = (PACKED) -#define PACKED_TXT_FILE_BODY_PATCH \ - TXT_FILE_BODY; \ - Styles = (PACKED,PATCH) - #define ARCHIVE_TXT_FILE_BODY \ TXT_FILE_BODY; \ Styles = (ARCHIVE) -#define ARCHIVE_TXT_FILE_BODY_PATCH \ - TXT_FILE_BODY; \ - Styles = (ARCHIVE,PATCH) - #ifdef WITH_HELPPACK_INTEGRATION #define ARCHIVE_TXT_FILE_BODY_HELPPACK \ TXT_FILE_BODY; \ @@ -125,14 +96,6 @@ Styles = (ARCHIVE,HELPPACK,LANGUAGEMODULE) #endif -#define ARCHIVE_SUBST_FILE_BODY \ - TXT_FILE_BODY; \ - Styles = (ARCHIVE,SUBSTITUTE) - -#define ARCHIVE_SUBST_FILE_BODY_PATCH \ - TXT_FILE_BODY; \ - Styles = (ARCHIVE,SUBSTITUTE,PATCH) - #define PACKED_LIB_FILE_BODY \ LIB_FILE_BODY; \ Styles = (PACKED); \ @@ -143,28 +106,12 @@ Styles = (PACKED,PATCH); \ Dir = SCP2_OOO_BIN_DIR -#define PACKED_FILTER_FILE_BODY \ - TXT_FILE_BODY; \ - Styles = (PACKED); \ - Dir = gid_Dir_Filter - -#define PACKED_FILTER_FILE_BODY_PATCH \ - TXT_FILE_BODY; \ - Styles = (PACKED,PATCH); \ - Dir = gid_Dir_Filter - #define STD_LIB_FILE(id,name) \ File id \ Name = LIBNAME(name); \ PACKED_LIB_FILE_BODY; \ End -#define STD_LIB_FILE_PATCH(id,name) \ - File id \ - Name = LIBNAME(name); \ - PACKED_LIB_FILE_BODY_PATCH; \ - End - #define SPECIAL_LIB_FILE(id,name) \ File id \ Name = SPECIAL_NAME(name); \ @@ -193,42 +140,12 @@ Styles = (PACKED); \ End -#define STD_RES_FILE_PATCH(id,name) \ - File id \ - TXT_FILE_BODY; \ - RESFILE_ALL_LANG(name); \ - Dir = gid_Dir_Resource; \ - Styles = (PACKED,PATCH); \ - End - -#define STD_RES_FILE_ONLY_PATCH(id,name) \ - File id \ - TXT_FILE_BODY; \ - RESFILE_ALL_LANG(name); \ - Dir = gid_Dir_Resource; \ - Styles = (PACKED,PATCH,PATCH_ONLY); \ - End - #define STD_FILTER_FILE(id,name) \ File id \ PACKED_LIB_FILE_BODY; \ Name = FILTER_LIBNAME(name); \ End -#define STD_FILTER_FILE_PATCH(id,name) \ - File id \ - PACKED_LIB_FILE_BODY_PATCH; \ - Name = FILTER_LIBNAME(name); \ - End - -#define STD_FONTUNX_FILE(id,name,fontname) \ - File id \ - TXT_FILE_BODY; \ - Dir = gid_Dir_Fonts_Truetype; \ - Styles = (PACKED, FONT_WARN_IF_EXISTS); \ - Name = STRING(name) ; \ - End - #define STD_FONTWIN_FILE(id,name,fontname) \ File id \ TXT_FILE_BODY; \ @@ -283,14 +200,6 @@ End #endif -#define STD_PY_FILE(id,name,dir) \ - File id \ - TXT_FILE_BODY; \ - Name = STRING(CONCAT2(name,.py)); \ - Dir = dir; \ - Styles = (PACKED,DONT_OVERWRITE); \ - End - #define STD_JAR_FILE(id,name) \ File id \ TXT_FILE_BODY; \ @@ -299,14 +208,6 @@ Styles = (PACKED,DONT_OVERWRITE); \ End -#define STD_JAR_FILE_PATCH(id,name) \ - File id \ - TXT_FILE_BODY; \ - Name = STRING(CONCAT2(name,.jar)); \ - Dir = gid_Dir_Classes; \ - Styles = (PACKED,DONT_OVERWRITE,PATCH); \ - End - #define JARFILENAME(name) STRING(CONCAT2(name,.jar)) #define PACKED_SHELLNEW_FILE_BODY \ @@ -327,20 +228,6 @@ PACKED_LIB_FILE_BODY; \ End -#define SPECIAL_COMPONENT_LIB_FILE_PATCH(id,name) \ - File id \ - Name = SPECIAL_COMPONENT_LIB_NAME(name); \ - PACKED_LIB_FILE_BODY_PATCH; \ - End - -#define SPECIAL_NO_WARNING_IF_NOT_EXISTS_FILE(id,name) \ - File id \ - TXT_FILE_BODY; \ - Name = LIBNAME(name); \ - Dir = SCP2_OOO_BIN_DIR; \ - Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS); \ - End - // --------------------------------------- #define CONDITIONAL_MODULE_ENTRY(name,modid) \ Module gid_Module_Root_Reg_##name \ -- cgit