--- a/fontsupport/fontutils/rom/fonts_variant.iby Fri Mar 12 15:48:30 2010 +0200
+++ b/fontsupport/fontutils/rom/fonts_variant.iby Mon Mar 15 12:44:38 2010 +0200
@@ -29,9 +29,12 @@
// Include proper font set based on configuration
#ifdef __CHINESE
#ifdef FF_LINKED_FONTS_CHINESE
- data=ABI_DIR\BUILD_DIR\s60snr.ttf resource\Fonts\s60snr.ttf
- data=ABI_DIR\BUILD_DIR\s60ssb.ttf resource\Fonts\s60ssb.ttf
- data=ABI_DIR\BUILD_DIR\s60tsb.ttf resource\Fonts\s60tsb.ttf
+ // Do not include S60 fonts if product fonts flag is set
+ #ifndef FF_PRODUCT_FONTS
+ data=ABI_DIR\BUILD_DIR\s60snr.ttf resource\Fonts\s60snr.ttf
+ data=ABI_DIR\BUILD_DIR\s60ssb.ttf resource\Fonts\s60ssb.ttf
+ data=ABI_DIR\BUILD_DIR\s60tsb.ttf resource\Fonts\s60tsb.ttf
+ #endif
#endif
#ifdef __CHINESE_PRC_FONTS
@@ -47,14 +50,14 @@
|| defined (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3)
// Reso OK, include HiRes font
- data=ABI_DIR\BUILD_DIR\S60SC_C.ttf resource\Fonts\S60SC_C.ttf
+ data=ABI_DIR\BUILD_DIR\S60SC_C.ttf resource\Fonts\S60SC_C.ttf
#else
// Invalid configuration: HiRes fonts enabled in low or unknown resolution device
#error "Feature configuration error: Chinese HiRes fonts not supported in this resolution!"
#endif
#else // Not FF_CHINESE_FONTS_HIRES - use regular stroke
- data=ABI_DIR\BUILD_DIR\S60SC.ccc resource\Fonts\S60SC.ccc
+ data=ABI_DIR\BUILD_DIR\S60SC.ccc resource\Fonts\S60SC.ccc
#endif
#endif //__CHINESE_PRC_FONTS
@@ -72,35 +75,37 @@
|| defined (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3)
// Reso OK, include HiRes font
- data=ABI_DIR\BUILD_DIR\S60TCHK_C.ttf resource\Fonts\S60TCHK_C.ttf
+ data=ABI_DIR\BUILD_DIR\S60TCHK_C.ttf resource\Fonts\S60TCHK_C.ttf
#else
// Invalid configuration: HiRes fonts enabled in low or unknown resolution device
#error "Feature configuration error: Chinese HiRes fonts not supported in this resolution!"
#endif
#else // Not FF_CHINESE_FONTS_HIRES - use regular stroke
- data=ABI_DIR\BUILD_DIR\S60TCHK.ccc resource\Fonts\S60TCHK.ccc
+ data=ABI_DIR\BUILD_DIR\S60TCHK.ccc resource\Fonts\S60TCHK.ccc
#endif
#endif //__CHINESE_TAIWAN_HK_FONTS
#elif defined(__JAPANESE)
- data=ABI_DIR\BUILD_DIR\HeiseiGothS60.ttf resource\Fonts\HeiseiGothS60.ttf
+ data=ABI_DIR\BUILD_DIR\HeiseiGothS60.ttf resource\Fonts\HeiseiGothS60.ttf
#elif defined(__LOCALES_65_IBY__)
- data=ABI_DIR\BUILD_DIR\Series60Korean.ttf resource\Fonts\Series60Korean.ttf
+ data=ABI_DIR\BUILD_DIR\Series60Korean.ttf resource\Fonts\Series60Korean.ttf
#else // Must be western
-
- data=ABI_DIR\BUILD_DIR\s60snr.ttf resource\Fonts\s60snr.ttf
- data=ABI_DIR\BUILD_DIR\s60ssb.ttf resource\Fonts\s60ssb.ttf
- data=ABI_DIR\BUILD_DIR\s60tsb.ttf resource\Fonts\s60tsb.ttf
+ // Do not include S60 fonts if product fonts flag is set
+ #ifndef FF_PRODUCT_FONTS
+ data=ABI_DIR\BUILD_DIR\s60snr.ttf resource\Fonts\s60snr.ttf
+ data=ABI_DIR\BUILD_DIR\s60ssb.ttf resource\Fonts\s60ssb.ttf
+ data=ABI_DIR\BUILD_DIR\s60tsb.ttf resource\Fonts\s60tsb.ttf
+ #endif
#endif //__CHINESE
// Digi font available in all variants
-data=ABI_DIR\BUILD_DIR\S60ZDIGI.ttf resource\Fonts\S60ZDIGI.ttf
+data=ABI_DIR\BUILD_DIR\S60ZDIGI.ttf resource\Fonts\S60ZDIGI.ttf
-#endif // FONTS_VARIANT_IBY
\ No newline at end of file
+#endif // FONTS_VARIANT_IBY