system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-01 18:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

makefiles: Store PE objects in subdirectories in the build tree.

Browse source 
This will make it possible to build multiple PE architectures.
This commit is contained in:
Alexandre Julliard 2022-10-26 11:04:43 +02:00
parent 8d43170b9f
commit 6a91264918
7 changed files with 108 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/ntdll/loader.c
View file

@ -2930,12 +2930,13 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne
if (!name[1] || wcscmp( name + wcslen(name) - 2, L"16" )) return status;
}
if (!get_env_var( L"WINEBUILDDIR", 20 + 2 * wcslen(name), new_name ))
if (!get_env_var( L"WINEBUILDDIR", 20 + 2 * wcslen(name) + wcslen(pe_dir), new_name ))
{
len = new_name->Length;
RtlAppendUnicodeToString( new_name, L"\\dlls\\" );
RtlAppendUnicodeToString( new_name, name );
if ((ext = wcsrchr( name, '.' )) && !wcscmp( ext, L".dll" )) new_name->Length -= 4 * sizeof(WCHAR);
RtlAppendUnicodeToString( new_name, pe_dir );
RtlAppendUnicodeToString( new_name, L"\\" );
RtlAppendUnicodeToString( new_name, name );
status = open_dll_file( new_name, pwm, mapping, image_info, id );
@ -2944,6 +2945,7 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne
new_name->Length = len;
RtlAppendUnicodeToString( new_name, L"\\programs\\" );
RtlAppendUnicodeToString( new_name, name );
RtlAppendUnicodeToString( new_name, pe_dir );
RtlAppendUnicodeToString( new_name, L"\\" );
RtlAppendUnicodeToString( new_name, name );
status = open_dll_file( new_name, pwm, mapping, image_info, id );

39
dlls/ntdll/unix/loader.c
View file

@ -1441,6 +1441,21 @@ static inline char *prepend( char *buffer, const char *str, size_t len )
return memcpy( buffer - len, str, len );
}
static inline char *prepend_build_dir_path( char *ptr, const char *ext, const char *arch_dir,
const char *top_dir )
{
char *name = ptr;
unsigned int namelen = strlen(name), extlen = strlen(ext);
if (namelen > extlen && !strcmp( name + namelen - extlen, ext )) namelen -= extlen;
ptr = prepend( ptr, arch_dir, strlen(arch_dir) );
ptr = prepend( ptr, name, namelen );
ptr = prepend( ptr, top_dir, strlen(top_dir) );
ptr = prepend( ptr, build_dir, strlen(build_dir) );
return ptr;
}
/***********************************************************************
* open_dll_file
*
@ -1536,7 +1551,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T
SECTION_IMAGE_INFORMATION *image_info,
ULONG_PTR zero_bits, WORD machine, BOOL prefer_native )
{
unsigned int i, pos, namepos, namelen, maxlen = 0;
unsigned int i, pos, namepos, maxlen = 0;
unsigned int len = nt_name->Length / sizeof(WCHAR);
char *ptr = NULL, *file, *ext = NULL;
const char *pe_dir = get_pe_dir( machine );
@ -1569,28 +1584,20 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T
if (build_dir)
{
/* try as a dll */
ptr = file + pos;
namelen = len + 1;
file[pos + len + 1] = 0;
if (ext && !strcmp( ext, ".dll" )) namelen -= 4;
ptr = prepend( ptr, ptr, namelen );
ptr = prepend( ptr, "/dlls", sizeof("/dlls") - 1 );
ptr = prepend( ptr, build_dir, strlen(build_dir) );
ptr = prepend_build_dir_path( file + pos, ".dll", pe_dir, "/dlls" );
status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, zero_bits, machine, prefer_native );
ptr = prepend_build_dir_path( file + pos, ".dll", "", "/dlls" );
if (status != STATUS_DLL_NOT_FOUND) goto done;
strcpy( file + pos + len + 1, ".so" );
status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native );
if (status != STATUS_DLL_NOT_FOUND) goto done;
/* now as a program */
ptr = file + pos;
namelen = len + 1;
file[pos + len + 1] = 0;
if (ext && !strcmp( ext, ".exe" )) namelen -= 4;
ptr = prepend( ptr, ptr, namelen );
ptr = prepend( ptr, "/programs", sizeof("/programs") - 1 );
ptr = prepend( ptr, build_dir, strlen(build_dir) );
ptr = prepend_build_dir_path( file + pos, ".exe", pe_dir, "/programs" );
status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, zero_bits, machine, prefer_native );
ptr = prepend_build_dir_path( file + pos, ".exe", "", "/programs" );
if (status != STATUS_DLL_NOT_FOUND) goto done;
strcpy( file + pos + len + 1, ".so" );
status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native );
@ -1983,7 +1990,7 @@ static void load_ntdll(void)
InitializeObjectAttributes( &attr, &str, 0, 0, NULL );
name = malloc( strlen( ntdll_dir ) + strlen( pe_dir ) + sizeof("/ntdll.dll.so") );
if (build_dir) sprintf( name, "%s/ntdll.dll", ntdll_dir );
if (build_dir) sprintf( name, "%s%s/ntdll.dll", ntdll_dir, pe_dir );
else sprintf( name, "%s%s/ntdll.dll", dll_dir, pe_dir );
status = open_builtin_pe_file( name, &attr, &module, &size, &info, 0, current_machine, FALSE );
if (status == STATUS_DLL_NOT_FOUND)
@ -2023,8 +2030,8 @@ static void load_apiset_dll(void)
init_unicode_string( &str, path );
InitializeObjectAttributes( &attr, &str, 0, 0, NULL );
name = malloc( strlen( ntdll_dir ) + strlen( pe_dir ) + sizeof("/apisetschema.dll") );
if (build_dir) sprintf( name, "%s/dlls/apisetschema/apisetschema.dll", build_dir );
name = malloc( strlen( ntdll_dir ) + strlen( pe_dir ) + sizeof("/apisetschema/apisetschema.dll") );
if (build_dir) sprintf( name, "%s/dlls/apisetschema%s/apisetschema.dll", build_dir, pe_dir );
else sprintf( name, "%s%s/apisetschema.dll", dll_dir, pe_dir );
status = open_unix_file( &handle, name, GENERIC_READ | SYNCHRONIZE, &attr, 0,
FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_OPEN,

32
dlls/setupapi/fakedll.c
View file

@ -407,6 +407,21 @@ static inline WCHAR *prepend( WCHAR *buffer, const WCHAR *str, size_t len )
return memcpy( buffer - len, str, len * sizeof(WCHAR) );
}
static inline WCHAR *prepend_build_dir_path( WCHAR *ptr, const WCHAR *ext, const WCHAR *arch_dir,
const WCHAR *top_dir, const WCHAR *build_dir )
{
WCHAR *name = ptr;
unsigned int namelen = wcslen(name), extlen = wcslen(ext);
if (namelen > extlen && !wcscmp( name + namelen - extlen, ext )) namelen -= extlen;
ptr = prepend( ptr, arch_dir, wcslen(arch_dir) );
ptr = prepend( ptr, name, namelen );
ptr = prepend( ptr, top_dir, wcslen(top_dir) );
ptr = prepend( ptr, build_dir, wcslen(build_dir) );
return ptr;
}
static const WCHAR *enum_load_path( unsigned int idx )
{
WCHAR buffer[32];
@ -421,7 +436,7 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size )
const WCHAR *path;
WCHAR *file, *ptr;
void *data = NULL;
unsigned int i, pos, len, namelen, maxlen = 0;
unsigned int i, pos, len, maxlen = 0;
WCHAR *p;
int res = 0;
@ -442,23 +457,13 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size )
if (build_dir)
{
/* try as a dll */
ptr = file + pos;
namelen = len + 1;
file[pos + len + 1] = 0;
if (namelen > 4 && !wcsncmp( ptr + namelen - 4, L".dll", 4 )) namelen -= 4;
ptr = prepend( ptr, ptr, namelen );
ptr = prepend( ptr, L"\\dlls", 5 );
ptr = prepend( ptr, build_dir, lstrlenW(build_dir) );
ptr = prepend_build_dir_path( file + pos, L".dll", pe_dir, L"\\dlls", build_dir );
if ((res = read_file( ptr, &data, size ))) goto done;
/* now as a program */
ptr = file + pos;
namelen = len + 1;
file[pos + len + 1] = 0;
if (namelen > 4 && !wcsncmp( ptr + namelen - 4, L".exe", 4 )) namelen -= 4;
ptr = prepend( ptr, ptr, namelen );
ptr = prepend( ptr, L"\\programs", 9 );
ptr = prepend( ptr, build_dir, lstrlenW(build_dir) );
ptr = prepend_build_dir_path( file + pos, L".exe", pe_dir, L"\\programs", build_dir );
if ((res = read_file( ptr, &data, size ))) goto done;
}
@ -979,6 +984,7 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard,
lstrcpyW( name, data.name );
if (default_ext) /* inside build dir */
{
lstrcatW( name, pe_dir );
lstrcatW( name, L"\\" );
lstrcatW( name, data.name );
if (wcschr( data.name, '.' ) && install_fake_dll( dest, file, delete, &delay_copy ))

10
programs/winecfg/libraries.c
View file

@ -252,14 +252,14 @@ static void clear_settings(HWND dialog)
/* load the list of available libraries from a given dir */
static void load_library_list_from_dir( HWND dialog, const WCHAR *dir_path, int check_subdirs )
{
static const WCHAR * const ext[] = { L".dll", L".dll.so", L".so", L"" };
static const WCHAR * const ext[] = { L".dll", L"", L".dll.so", L".so" };
WCHAR *buffer, *p, name[256];
unsigned int i;
HANDLE handle;
WIN32_FIND_DATAW data;
ULONG maxlen = wcslen(dir_path) + wcslen(pe_dir) + 10 + 2 * ARRAY_SIZE(name);
buffer = HeapAlloc( GetProcessHeap(), 0, (wcslen(dir_path) + 10) * sizeof(WCHAR) + 2 * sizeof(name) );
buffer = HeapAlloc( GetProcessHeap(), 0, maxlen * sizeof(WCHAR) );
wcscpy( buffer, dir_path );
wcscat( buffer, L"\\*" );
buffer[1] = '\\'; /* change \??\ to \\?\ */
@ -282,7 +282,9 @@ static void load_library_list_from_dir( HWND dialog, const WCHAR *dir_path, int
if (!show_dll_in_list( data.cFileName )) continue;
for (i = 0; i < ARRAY_SIZE( ext ); i++)
{
swprintf( p, 2 * ARRAY_SIZE(name) + 10, L"%s\\%s%s", data.cFileName, data.cFileName, ext[i] );
if (!ext[i][0] && !wcschr( data.cFileName, '.' )) continue;
swprintf( p, buffer + maxlen - p, L"%s%s\\%s%s", data.cFileName,
i > 1 ? L"" : pe_dir, data.cFileName, ext[i] );
if (GetFileAttributesW( buffer ) != INVALID_FILE_ATTRIBUTES)
{
SendDlgItemMessageW( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)data.cFileName );

98
tools/makedep.c
View file

@ -162,6 +162,8 @@ static const char *msgfmt;
static const char *ln_s;
static const char *sed_cmd;
/* per-architecture global variables */
static const char *arch_dirs[MAX_ARCHS];
static const char *arch_pe_dirs[MAX_ARCHS];
static const char *arch_install_dirs[MAX_ARCHS];
static const char *strip_progs[MAX_ARCHS];
static const char *debug_flags[MAX_ARCHS];
@ -629,7 +631,7 @@ static int is_multiarch( unsigned int arch )
*/
static char *arch_module_name( const char *module, unsigned int arch )
{
return strmake( "%s%s", module, arch ? "" : dll_ext );
return strmake( "%s%s%s", arch_dirs[arch], module, arch ? "" : dll_ext );
}
@ -874,6 +876,7 @@ static struct incl_file *add_generated_source( struct makefile *make, const char
{
struct incl_file *file = xmalloc( sizeof(*file) );
name = strmake( "%s%s", arch_dirs[arch], name );
memset( file, 0, sizeof(*file) );
file->file = add_file( name );
file->arch = arch;
@ -2072,7 +2075,7 @@ static const char *get_static_lib( const struct makefile *make, const char *name
if (strncmp( make->staticlib, "lib", 3 )) return NULL;
if (strncmp( make->staticlib + 3, name, strlen(name) )) return NULL;
if (strcmp( make->staticlib + 3 + strlen(name), ".a" )) return NULL;
return obj_dir_path( make, make->staticlib );
return obj_dir_path( make, strmake( "%s%s", arch_dirs[arch], make->staticlib ));
}
@ -2263,7 +2266,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra
for (j = 0; j < subdirs.count; j++)
{
if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name ))
lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name ));
lib = obj_dir_path( submakes[j], strmake( "%slib%s.a", arch_dirs[arch], name ));
else
lib = get_static_lib( submakes[j], name, arch );
if (lib) break;
@ -2274,7 +2277,6 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra
const char *ext = NULL;
if (type == IMPORT_TYPE_DELAYED && !delay_load_flags[arch]) ext = ".delay.a";
else if (arch) ext = ".cross.a";
if (ext) lib = replace_extension( lib, ".a", ext );
strarray_add_uniq( deps, lib );
strarray_add( &ret, lib );
@ -2430,10 +2432,7 @@ static void output_winegcc_command( struct makefile *make, unsigned int arch )
output_filename( tools_path( make, "winebuild" ));
}
output_filenames( target_flags[arch] );
if (arch)
output_filename( "--lib-suffix=.cross.a" );
else
output_filenames( lddll_flags );
if (!arch) output_filenames( lddll_flags );
}
@ -2838,7 +2837,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source,
for (arch = 0; arch < archs.count; arch++)
{
if (!arch != !multiarch) continue;
dest = strmake( "%s%s", obj, idl_outputs[i].ext );
dest = strmake( "%s%s%s", arch_dirs[arch], obj, idl_outputs[i].ext );
if (!find_src_file( make, dest )) strarray_add( &make->clean_files, dest );
strarray_add( &multiarch_targets[arch], dest );
}
@ -2879,7 +2878,8 @@ static void output_source_idl( struct makefile *make, struct incl_file *source,
for (i = 0; i < source->importlibdeps.count; i++)
{
struct makefile *submake = find_importlib_module( source->importlibdeps.str[i] );
output_filename( obj_dir_path( submake, submake->module ));
const char *module = strmake( "%s%s", arch_pe_dirs[arch], submake->module );
output_filename( obj_dir_path( submake, module ));
}
output( "\n" );
}
@ -3054,8 +3054,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source,
struct strarray dll_flags = get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" );
struct strarray all_libs = empty_strarray, dep_libs = empty_strarray;
struct strarray default_imports = empty_strarray;
char *dll_name, *obj_name, *output_file;
const char *debug_file;
const char *dll_name, *obj_name, *res_name, *output_file, *debug_file;
unsigned int arch = make->is_cross ? 1 : 0;
if (!imports.count) imports = make->imports;
@ -3066,19 +3065,20 @@ static void output_source_spec( struct makefile *make, struct incl_file *source,
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, arch ) );
dll_name = arch_module_name( strmake( "%s.dll", obj ), arch );
obj_name = strmake( "%s%s", obj_dir_path( make, obj ), arch ? ".cross.o" : ".o" );
obj_name = obj_dir_path( make, strmake( "%s%s.o", arch_dirs[arch], obj ));
res_name = strmake( "%s%s.res", arch_dirs[arch], obj );
output_file = obj_dir_path( make, dll_name );
strarray_add( &make->clean_files, dll_name );
strarray_add( &make->res_files[arch], strmake( "%s.res", obj ));
output( "%s.res:", obj_dir_path( make, obj ));
output_filename( obj_dir_path( make, dll_name ));
strarray_add( &make->res_files[arch], res_name );
output( "%s:", obj_dir_path( make, res_name ));
output_filename( output_file );
output_filename( tools_path( make, "wrc" ));
output( "\n" );
output( "\t%secho \"%s.dll TESTDLL \\\"%s\\\"\" | %s -u -o $@\n", cmd_prefix( "WRC" ), obj, output_file,
tools_path( make, "wrc" ));
output( "%s:", output_file);
output( "%s:", output_file );
output_filename( source->filename );
output_filename( obj_name );
output_filenames( dep_libs );
@ -3121,7 +3121,7 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou
!(source->file->flags & FLAG_C_IMPLIB) &&
(!make->staticlib || make->extlib)) return;
obj_name = strmake( "%s%s.o", obj, arch ? ".cross" : "" );
obj_name = strmake( "%s%s.o", source->arch ? "" : arch_dirs[arch], obj );
strarray_add( targets, obj_name );
if (source->file->flags & FLAG_C_UNIX)
@ -3172,9 +3172,8 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou
{
const char *ok_file, *test_exe;
ok_file = strmake( "%s.ok", obj );
ok_file = strmake( "%s%s.ok", arch_dirs[arch], obj );
test_exe = replace_extension( make->testdll, ".dll", "_test.exe" );
strarray_add( &make->ok_files, ok_file );
output( "%s:\n", obj_dir_path( make, ok_file ));
output( "\t%s%s $(RUNTESTFLAGS) -T . -M %s -p %s %s && touch $@\n",
@ -3272,7 +3271,7 @@ static void output_module( struct makefile *make, unsigned int arch )
struct strarray all_libs = empty_strarray;
struct strarray dep_libs = empty_strarray;
struct strarray imports = make->imports;
const char *module_name = make->module;
const char *module_name;
const char *debug_file;
char *spec_file = NULL;
unsigned int i;
@ -3302,17 +3301,16 @@ static void output_module( struct makefile *make, unsigned int arch )
strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" ));
}
}
strarray_add( &make->all_targets[arch], module_name );
else module_name = strmake( "%s%s", arch_pe_dirs[arch], make->module );
strarray_add( &make->all_targets[arch], module_name );
if (make->data_only)
add_install_rule( make, make->module, arch, module_name,
strmake( "d%s%s", arch_install_dirs[arch], make->module ));
else if (arch || *dll_ext)
add_install_rule( make, make->module, arch, module_name,
strmake( "%c%s%s", '0' + arch, arch_install_dirs[arch], module_name ));
else
add_install_rule( make, make->module, arch, module_name,
strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", module_name ));
strmake( "%c%s%s%s", '0' + arch, arch_install_dirs[arch], make->module,
arch ? "" : dll_ext ));
output( "%s:", obj_dir_path( make, module_name ));
if (spec_file) output_filename( spec_file );
@ -3332,7 +3330,7 @@ static void output_module( struct makefile *make, unsigned int arch )
output_filenames( make->extradllflags );
output_filenames_obj_dir( make, make->object_files[arch] );
output_filenames_obj_dir( make, make->res_files[arch] );
debug_file = get_debug_file( make, make->module, arch );
debug_file = get_debug_file( make, module_name, arch );
if (debug_file) output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file )));
output_filenames( all_libs );
output_filename( arch_make_variable( "LDFLAGS", arch ));
@ -3351,15 +3349,14 @@ static void output_module( struct makefile *make, unsigned int arch )
*/
static void output_fake_module( struct makefile *make, unsigned int arch )
{
char *spec_file = NULL;
const char *spec_file = NULL, *name = strmake( "%s%s", arch_pe_dirs[arch], make->module );
if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" ));
strarray_add( &make->all_targets[arch], make->module );
add_install_rule( make, make->module, arch, make->module,
strmake( "d%s%s", arch_install_dirs[arch], make->module ));
strarray_add( &make->all_targets[arch], name );
add_install_rule( make, make->module, arch, name, strmake( "d$(dlldir)/%s", name ));
output( "%s:", obj_dir_path( make, make->module ));
output( "%s:", obj_dir_path( make, name ));
if (spec_file) output_filename( spec_file );
output_filenames_obj_dir( make, make->res_files[arch] );
output_filename( tools_path( make, "winebuild" ));
@ -3384,24 +3381,16 @@ static void output_fake_module( struct makefile *make, unsigned int arch )
static void output_import_lib( struct makefile *make, unsigned int arch )
{
char *spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" ));
char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib ));
const char *name = strmake( "%slib%s.a", arch_dirs[arch], make->importlib );
if (arch)
{
strarray_add( &make->clean_files, strmake( "lib%s.cross.a", make->importlib ));
output_filename( strmake( "%s.cross.a", importlib_path ));
}
else
{
strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib ));
output_filename( strmake( "%s.a", importlib_path ));
}
strarray_add( &make->clean_files, name );
if (needs_delay_lib( make, arch ))
{
strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib ));
output( " %s.delay.a", importlib_path );
const char *delay_name = replace_extension( name, ".a", ".delay.a" );
strarray_add( &make->clean_files, delay_name );
output( "%s ", obj_dir_path( make, delay_name ));
}
output( ": %s %s", tools_path( make, "winebuild" ), spec_file );
output( "%s: %s %s", obj_dir_path( make, name ), tools_path( make, "winebuild" ), spec_file );
output_filenames_obj_dir( make, make->implib_files[arch] );
output( "\n" );
output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) );
@ -3414,8 +3403,7 @@ static void output_import_lib( struct makefile *make, unsigned int arch )
if (!arch && is_native_arch_disabled( make )) return;
add_install_rule( make, make->importlib, arch,
arch ? strmake( "lib%s.cross.a", make->importlib ) : strmake( "lib%s.a", make->importlib ),
add_install_rule( make, make->importlib, arch, name,
strmake( "d%slib%s.a", arch_install_dirs[arch], make->importlib ));
}
@ -3480,7 +3468,7 @@ static void output_unix_lib( struct makefile *make )
*/
static void output_static_lib( struct makefile *make, unsigned int arch )
{
const char *name = arch ? replace_extension( make->staticlib, ".a", ".cross.a" ) : make->staticlib;
const char *name = strmake( "%s%s", arch_dirs[arch], make->staticlib );
strarray_add( &make->clean_files, name );
output( "%s: %s", obj_dir_path( make, name ), tools_path( make, "winebuild" ));
@ -3587,7 +3575,8 @@ static void output_test_module( struct makefile *make, unsigned int arch )
output_filename( tools_path( make, "winegcc" ));
output( "\n" );
output( "programs/winetest/%s_test.res: %s\n", basemodule, obj_dir_path( make, stripped ));
output( "programs/winetest/%s%s_test.res: %s\n", arch_dirs[arch], basemodule,
obj_dir_path( make, stripped ));
output( "\t%secho \"%s_test.exe TESTRES \\\"%s\\\"\" | %s -u -o $@\n", cmd_prefix( "WRC" ),
basemodule, obj_dir_path( make, stripped ), tools_path( make, "wrc" ));
@ -3816,7 +3805,8 @@ static void output_sources( struct makefile *make )
if (submakes[i]->disabled[arch]) continue;
if (enable_tests.count && !strarray_exists( &enable_tests, submakes[i]->testdll )) continue;
strarray_add( &make->res_files[arch],
replace_extension( submakes[i]->testdll, ".dll", "_test.res" ));
strmake( "%s%s", arch_dirs[arch],
replace_extension( submakes[i]->testdll, ".dll", "_test.res" )));
}
}
@ -4502,6 +4492,8 @@ int main( int argc, char *argv[] )
if (!host_cpu || !(host_cpu = normalize_arch( host_cpu ))) host_cpu = "unknown";
strarray_add( &archs, host_cpu );
arch_dirs[0] = "";
arch_pe_dirs[0] = strmake( "%s-windows/", archs.str[0] );
arch_install_dirs[0] = *dll_ext ? strmake( "$(dlldir)/%s-unix/", archs.str[0] ) : "$(dlldir)/";
strip_progs[0] = "\"$(STRIP)\"";
@ -4516,7 +4508,9 @@ int main( int argc, char *argv[] )
for (arch = 1; arch < archs.count; arch++)
{
arch_install_dirs[arch] = strmake( "$(dlldir)/%s-windows/", archs.str[arch] );
arch_dirs[arch] = strmake( "%s-windows/", archs.str[arch] );
arch_pe_dirs[arch] = arch_dirs[arch];
arch_install_dirs[arch] = strmake( "$(dlldir)/%s", arch_dirs[arch] );
}
for (arch = 0; arch < archs.count; arch++)

4
tools/widl/widl.c
View file

@ -686,8 +686,8 @@ int open_typelib( const char *name )
{
int namelen = strlen( name );
if (strendswith( name, ".dll" )) namelen -= 4;
TRYOPEN( strmake( "%.*s/%.*s/%s", (int)strlen(dlldirs.str[i]) - 2, dlldirs.str[i],
namelen, name, name ));
TRYOPEN( strmake( "%.*s/%.*s%s/%s", (int)strlen(dlldirs.str[i]) - 2, dlldirs.str[i],
namelen, name, pe_dir, name ));
}
else
{

15
tools/winegcc/utils.c
View file

@ -93,7 +93,7 @@ file_type get_file_type(const char* filename)
return file_other;
}
static char* try_lib_path(const char* dir, const char* pre,
static char* try_lib_path(const char *dir, const char *arch_dir, const char *pre,
const char* library, const char* ext,
file_type expected_type)
{
@ -101,7 +101,7 @@ static char* try_lib_path(const char* dir, const char* pre,
file_type type;
/* first try a subdir named from the library we are looking for */
fullname = strmake("%s/%s/%s%s%s", dir, library, pre, library, ext);
fullname = strmake("%s/%s%s/%s%s%s", dir, library, arch_dir, pre, library, ext);
if (verbose > 1) fprintf(stderr, "Try %s...", fullname);
type = get_file_type(fullname);
if (verbose > 1) fprintf(stderr, type == expected_type ? "FOUND!\n" : "no\n");
@ -120,25 +120,28 @@ static char* try_lib_path(const char* dir, const char* pre,
static file_type guess_lib_type(struct target target, const char* dir,
const char* library, const char *prefix, const char *suffix, char** file)
{
const char *arch_dir = "";
if (target.platform != PLATFORM_WINDOWS &&
target.platform != PLATFORM_MINGW &&
target.platform != PLATFORM_CYGWIN)
{
/* Unix shared object */
if ((*file = try_lib_path(dir, prefix, library, ".so", file_so)))
if ((*file = try_lib_path(dir, "", prefix, library, ".so", file_so)))
return file_so;
/* Mach-O (Darwin/Mac OS X) Dynamic Library behaves mostly like .so */
if ((*file = try_lib_path(dir, prefix, library, ".dylib", file_so)))
if ((*file = try_lib_path(dir, "", prefix, library, ".dylib", file_so)))
return file_so;
/* Windows DLL */
if ((*file = try_lib_path(dir, prefix, library, ".def", file_def)))
if ((*file = try_lib_path(dir, "", prefix, library, ".def", file_def)))
return file_dll;
}
else arch_dir = get_arch_dir( target );
/* static archives */
if ((*file = try_lib_path(dir, prefix, library, suffix, file_arh)))
if ((*file = try_lib_path(dir, arch_dir, prefix, library, suffix, file_arh)))
return file_arh;
return file_na;