winebuild: Add a -munix option.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
7f3d463b45
commit
5061261c5e
|
@ -358,6 +358,7 @@ extern int verbose;
|
||||||
extern int link_ext_symbols;
|
extern int link_ext_symbols;
|
||||||
extern int force_pointer_size;
|
extern int force_pointer_size;
|
||||||
extern int unwind_tables;
|
extern int unwind_tables;
|
||||||
|
extern int unix_lib;
|
||||||
|
|
||||||
extern char *input_file_name;
|
extern char *input_file_name;
|
||||||
extern char *spec_file_name;
|
extern char *spec_file_name;
|
||||||
|
|
|
@ -46,6 +46,7 @@ int verbose = 0;
|
||||||
int link_ext_symbols = 0;
|
int link_ext_symbols = 0;
|
||||||
int force_pointer_size = 0;
|
int force_pointer_size = 0;
|
||||||
int unwind_tables = 0;
|
int unwind_tables = 0;
|
||||||
|
int unix_lib = 0;
|
||||||
|
|
||||||
#ifdef __i386__
|
#ifdef __i386__
|
||||||
enum target_cpu target_cpu = CPU_x86;
|
enum target_cpu target_cpu = CPU_x86;
|
||||||
|
@ -411,6 +412,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec )
|
||||||
else if (!strcmp( optarg, "64" )) force_pointer_size = 8;
|
else if (!strcmp( optarg, "64" )) force_pointer_size = 8;
|
||||||
else if (!strcmp( optarg, "arm" )) thumb_mode = 0;
|
else if (!strcmp( optarg, "arm" )) thumb_mode = 0;
|
||||||
else if (!strcmp( optarg, "thumb" )) thumb_mode = 1;
|
else if (!strcmp( optarg, "thumb" )) thumb_mode = 1;
|
||||||
|
else if (!strcmp( optarg, "unix" )) unix_lib = 1;
|
||||||
else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 );
|
else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 );
|
||||||
else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 );
|
else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 );
|
||||||
else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 );
|
else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 );
|
||||||
|
|
|
@ -160,6 +160,10 @@ Generate respectively 16-bit, 32-bit or 64-bit code.
|
||||||
.BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfpu= option ,\ \-mfloat-abi= option
|
.BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfpu= option ,\ \-mfloat-abi= option
|
||||||
Set code generation options for the assembler.
|
Set code generation options for the assembler.
|
||||||
.TP
|
.TP
|
||||||
|
.B \-munix
|
||||||
|
Build a library that imports standard functions from the Unix C
|
||||||
|
library instead of the Windows runtime.
|
||||||
|
.TP
|
||||||
.BI \-M,\ --main-module= module
|
.BI \-M,\ --main-module= module
|
||||||
When building a 16-bit dll, set the name of its 32-bit counterpart to
|
When building a 16-bit dll, set the name of its 32-bit counterpart to
|
||||||
\fImodule\fR. This is used to enforce that the load order for the
|
\fImodule\fR. This is used to enforce that the load order for the
|
||||||
|
|
|
@ -845,6 +845,7 @@ static strarray *get_winebuild_args(struct options *opts)
|
||||||
strarray_add( spec_args, "--target" );
|
strarray_add( spec_args, "--target" );
|
||||||
strarray_add( spec_args, opts->target );
|
strarray_add( spec_args, opts->target );
|
||||||
}
|
}
|
||||||
|
if (!opts->use_msvcrt) strarray_add( spec_args, "-munix" );
|
||||||
if (opts->unwind_tables) strarray_add( spec_args, "-fasynchronous-unwind-tables" );
|
if (opts->unwind_tables) strarray_add( spec_args, "-fasynchronous-unwind-tables" );
|
||||||
else strarray_add( spec_args, "-fno-asynchronous-unwind-tables" );
|
else strarray_add( spec_args, "-fno-asynchronous-unwind-tables" );
|
||||||
return spec_args;
|
return spec_args;
|
||||||
|
|
Loading…
Reference in New Issue