equal
deleted
inserted
replaced
45 #if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH) \ |
45 #if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH) \ |
46 || defined(__LAYOUT_320_480) || defined(__LAYOUT_320_480_TOUCH) \ |
46 || defined(__LAYOUT_320_480) || defined(__LAYOUT_320_480_TOUCH) \ |
47 || defined(__LAYOUT_480_320) || defined(__LAYOUT_480_320_TOUCH) \ |
47 || defined(__LAYOUT_480_320) || defined(__LAYOUT_480_320_TOUCH) \ |
48 || defined(__LAYOUT_480_640) || defined(__LAYOUT_480_640_TOUCH) \ |
48 || defined(__LAYOUT_480_640) || defined(__LAYOUT_480_640_TOUCH) \ |
49 || defined(__LAYOUT_640_480) || defined(__LAYOUT_640_480_TOUCH) \ |
49 || defined(__LAYOUT_640_480) || defined(__LAYOUT_640_480_TOUCH) \ |
50 || defined (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3) |
50 || defined (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3) \ |
|
51 || defined (FF_LAYOUT_480_640_TOUCH_VGA4) || defined (FF_LAYOUT_640_480_TOUCH_VGA4) |
51 |
52 |
52 // Reso OK, include HiRes font |
53 // Reso OK, include HiRes font |
53 data=ABI_DIR\BUILD_DIR\S60SC_C.ttf resource\Fonts\S60SC_C.ttf |
54 data=ABI_DIR\BUILD_DIR\S60SC_C.ttf resource\Fonts\S60SC_C.ttf |
54 #else |
55 #else |
55 // Invalid configuration: HiRes fonts enabled in low or unknown resolution device |
56 // Invalid configuration: HiRes fonts enabled in low or unknown resolution device |
70 #if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH) \ |
71 #if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH) \ |
71 || defined(__LAYOUT_320_480) || defined(__LAYOUT_320_480_TOUCH) \ |
72 || defined(__LAYOUT_320_480) || defined(__LAYOUT_320_480_TOUCH) \ |
72 || defined(__LAYOUT_480_320) || defined(__LAYOUT_480_320_TOUCH) \ |
73 || defined(__LAYOUT_480_320) || defined(__LAYOUT_480_320_TOUCH) \ |
73 || defined(__LAYOUT_480_640) || defined(__LAYOUT_480_640_TOUCH) \ |
74 || defined(__LAYOUT_480_640) || defined(__LAYOUT_480_640_TOUCH) \ |
74 || defined(__LAYOUT_640_480) || defined(__LAYOUT_640_480_TOUCH) \ |
75 || defined(__LAYOUT_640_480) || defined(__LAYOUT_640_480_TOUCH) \ |
75 || defined (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3) |
76 || defined (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3) \ |
|
77 || defined (FF_LAYOUT_480_640_TOUCH_VGA4) || defined (FF_LAYOUT_640_480_TOUCH_VGA4) |
76 |
78 |
77 // Reso OK, include HiRes font |
79 // Reso OK, include HiRes font |
78 data=ABI_DIR\BUILD_DIR\S60TCHK_C.ttf resource\Fonts\S60TCHK_C.ttf |
80 data=ABI_DIR\BUILD_DIR\S60TCHK_C.ttf resource\Fonts\S60TCHK_C.ttf |
79 #else |
81 #else |
80 // Invalid configuration: HiRes fonts enabled in low or unknown resolution device |
82 // Invalid configuration: HiRes fonts enabled in low or unknown resolution device |