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

winebuild: Add win32/win64 generic architectures in addition to specific CPUs.

oldstable
Alexandre Julliard 2009-08-24 12:49:07 +02:00
parent 6c70626180
commit 3f7d342cfa
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/winebuild/build.h
View File

@ -145,6 +145,8 @@ extern enum target_platform target_platform;
#define FLAG_CPU(cpu) (0x01000 << (cpu))
#define FLAG_CPU_MASK 0x1f000
#define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64))
#define FLAG_CPU_WIN32 (FLAG_CPU_MASK & ~FLAG_CPU_WIN64)
#define MAX_ORDINALS 65535

17
tools/winebuild/parser.c
View File

@ -435,13 +435,20 @@ static const char *parse_spec_flags( ORDDEF *odp )
char *cpu_name = strtok( args, "," );
while (cpu_name)
{
enum target_cpu cpu = get_cpu_from_name( cpu_name );
if (cpu == -1)
if (!strcmp( cpu_name, "win32" ))
odp->flags |= FLAG_CPU_WIN32;
else if (!strcmp( cpu_name, "win64" ))
odp->flags |= FLAG_CPU_WIN64;
else
{
error( "Unknown architecture '%s'\n", cpu_name );
return NULL;
enum target_cpu cpu = get_cpu_from_name( cpu_name );
if (cpu == -1)
{
error( "Unknown architecture '%s'\n", cpu_name );
return NULL;
}
odp->flags |= FLAG_CPU( cpu );
}
odp->flags |= FLAG_CPU( cpu );
cpu_name = strtok( NULL, "," );
}
free( args );