ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.93 by root, Fri Jan 23 06:39:41 2009 UTC vs.
Revision 1.94 by root, Sun Mar 29 22:28:13 2009 UTC

56 56
57 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
58 # pango is relocatable on win32 58 # pango is relocatable on win32
59 } else { 59 } else {
60 # OS X 60 # OS X
61 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
62 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
63 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
64 $ENV{DYLD_LIBRARY_PATH} = $root; 62 $ENV{DYLD_LIBRARY_PATH} = $root;
65 chdir $root; # for pango modules, maybe other things 63 chdir $root; # for pango modules, maybe other things
66 } 64 }
67 65
68 unshift @INC, $root; 66 unshift @INC, $root;
69 } 67 }
70} 68}
71 69
72# prepend private library directory 70# prepend private library directory and prepare env
73BEGIN { 71BEGIN {
74 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
75 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
76 if (-d $path) { 74 if (-d $path) {
77 unshift @INC, $path; 75 unshift @INC, $path;
2756 } 2754 }
2757 } 2755 }
2758 2756
2759 sdl_init; 2757 sdl_init;
2760 2758
2759 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2760 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2761
2761 { 2762 {
2762 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2763 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2763 DejaVuSans.ttf 2764 DejaVuSans.ttf
2764 DejaVuSansMono.ttf 2765 DejaVuSansMono.ttf
2765 DejaVuSans-Bold.ttf 2766 DejaVuSans-Bold.ttf
2766 DejaVuSansMono-Bold.ttf 2767 DejaVuSansMono-Bold.ttf
2767 DejaVuSans-Oblique.ttf 2768 DejaVuSans-Oblique.ttf
2768 DejaVuSansMono-Oblique.ttf 2769 DejaVuSansMono-Oblique.ttf
2769 DejaVuSans-BoldOblique.ttf 2770 DejaVuSans-BoldOblique.ttf
2770 DejaVuSansMono-BoldOblique.ttf 2771 DejaVuSansMono-BoldOblique.ttf
2772 mona.ttf
2771 ); 2773 );
2772 2774
2773 DC::add_font $_ for @fonts; 2775 DC::add_font $_ for @fonts;
2774 2776
2775 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2777 $FONT_PROP = new_from_file DC::Font $fonts[0];

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines