system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-06-29 06:14:34 +00:00
Code Issues Projects Releases Wiki Activity

makefiles: Hardcode the fonts directory.

Browse Source 
It's Wine-specific anyway.
This commit is contained in:
Alexandre Julliard 2024-06-24 13:44:54 +02:00
parent 58de2dec08
commit 13159b0767
5 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -869,7 +869,6 @@ CC
SET_MAKE
srcdir
nlsdir
fontdir
dlldir
host_os
host_vendor
@ -4678,8 +4677,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
dlldir=\${libdir}/wine
fontdir=\${datadir}/wine/fonts
nlsdir=\${datadir}/wine/nls
@ -23982,7 +23979,6 @@ host_cpu = $host_cpu
host_vendor = $host_vendor
host_os = $host_os
dlldir = $dlldir
fontdir = $fontdir
nlsdir = $nlsdir
srcdir = $srcdir
SET_MAKE = $SET_MAKE

1
configure.ac
View File

@ -92,7 +92,6 @@ AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine i
AC_CANONICAL_HOST
AC_SUBST(dlldir,[\${libdir}/wine])
AC_SUBST(fontdir,[\${datadir}/wine/fonts])
AC_SUBST(nlsdir,[\${datadir}/wine/nls])
AC_SUBST(srcdir)

2
dlls/win32u/Makefile.in
View File

@ -56,5 +56,3 @@ SOURCES = \
vulkan.c \
window.c \
winstation.c
font_EXTRADEFS = -DWINE_FONT_DIR=\"`${MAKEDEP} -R ${datadir}/wine ${fontdir}`\"

20
dlls/win32u/font.c
View File

@ -462,10 +462,6 @@ static const struct nls_update_font_list
static pthread_mutex_t font_lock = PTHREAD_MUTEX_INITIALIZER;
#ifndef WINE_FONT_DIR
#define WINE_FONT_DIR "fonts"
#endif
#ifdef WORDS_BIGENDIAN
#define GET_BE_WORD(x) (x)
#define GET_BE_DWORD(x) (x)
@ -476,20 +472,12 @@ static pthread_mutex_t font_lock = PTHREAD_MUTEX_INITIALIZER;
static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path )
{
const char *dir;
const char *dir = ntdll_get_build_dir();
ULONG len = MAX_PATH;
if ((dir = ntdll_get_data_dir()))
{
wine_unix_to_nt_file_name( dir, path, &len );
asciiz_to_unicode( path + len - 1, "\\" WINE_FONT_DIR "\\" );
}
else if ((dir = ntdll_get_build_dir()))
{
wine_unix_to_nt_file_name( dir, path, &len );
asciiz_to_unicode( path + len - 1, "\\fonts\\" );
}
if (!dir) dir = ntdll_get_data_dir();
wine_unix_to_nt_file_name( dir, path, &len );
asciiz_to_unicode( path + len - 1, "\\fonts\\" );
if (file) lstrcatW( path, file );
}

6
tools/makedep.c
View File

@ -2664,7 +2664,7 @@ static struct strarray get_removable_dirs( struct strarray files )
static void output_uninstall_rules( struct makefile *make )
{
static const char *dirs_order[] =
{ "$(includedir)", "$(mandir)", "$(fontdir)", "$(nlsdir)", "$(datadir)", "$(dlldir)" };
{ "$(includedir)", "$(mandir)", "$(nlsdir)", "$(datadir)", "$(dlldir)" };
struct strarray uninstall_dirs;
unsigned int i, j;
@ -2987,7 +2987,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source,
}
if (source->file->flags & FLAG_INSTALL)
{
add_install_rule( make, source->name, 0, ttf_obj, strmake( "D$(fontdir)/%s", ttf_obj ));
add_install_rule( make, source->name, 0, ttf_obj, strmake( "D$(datadir)/wine/fonts/%s", ttf_obj ));
output_srcdir_symlink( make, ttf_obj );
}
@ -3005,7 +3005,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source,
tools_path( make, "sfnt2fon" ), ttf_file );
output( "\t%s%s -q -o $@ %s %s\n", cmd_prefix( "GEN" ),
tools_path( make, "sfnt2fon" ), ttf_file, args );
add_install_rule( make, source->name, 0, xstrdup(font), strmake( "d$(fontdir)/%s", font ));
add_install_rule( make, source->name, 0, xstrdup(font), strmake( "d$(datadir)/wine/fonts/%s", font ));
}
}
}