marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winebuild: When building implibs, invoke dlltool with a machine type. 

Signed-off-by: Charles Davis <cdavis5x@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Charles Davis 2016-02-11 03:20:27 -07:00 committed by Alexandre Julliard
parent af41733890
commit 2ea17846b8
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/winebuild/import.c
View File

@ -1329,6 +1329,7 @@ void output_import_lib( DLLSPEC *spec, char **argv )
{
struct strarray *args;
char *def_file;
const char *as_flags, *m_flag;
if (target_platform != PLATFORM_WINDOWS)
fatal_error( "Unix-style import libraries not supported yet\n" );
@ -1342,7 +1343,23 @@ void output_import_lib( DLLSPEC *spec, char **argv )
output_file = NULL;
args = find_tool( "dlltool", NULL );
switch (target_cpu)
{
case CPU_x86:
m_flag = "i386";
as_flags = "--as-flags=--32";
break;
case CPU_x86_64:
m_flag = "i386:x86-64";
as_flags = "--as-flags=--64";
break;
default:
m_flag = NULL;
break;
}
strarray_add( args, "-k", "-l", output_file_name, "-d", def_file, NULL );
if (m_flag)
strarray_add( args, "-m", m_flag, as_flags, NULL );
spawn( args );
strarray_free( args );