Alexandre Julliard : winegcc: Pass the -m32/-m64 options to winebuild too.
Alexandre Julliard
julliard at winehq.org
Thu Feb 5 09:20:55 CST 2009
Module: wine
Branch: master
Commit: 64e43b619286dbc3a347dad5d6ad6f981803348c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e43b619286dbc3a347dad5d6ad6f981803348c
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Feb 4 20:10:49 2009 +0100
winegcc: Pass the -m32/-m64 options to winebuild too.
---
tools/winegcc/winegcc.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index e0b03b1..b288ed0 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -202,6 +202,7 @@ struct options
int gui_app;
int unicode_app;
int compile_only;
+ int force_pointer_size;
const char* wine_objdir;
const char* output_name;
const char* image_base;
@@ -643,6 +644,8 @@ static void build(struct options* opts)
strarray_add(spec_args, "--target");
strarray_add(spec_args, opts->target);
}
+ if (opts->force_pointer_size)
+ strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));
strarray_add(spec_args, "--as-cmd");
strarray_add(spec_args, AS);
strarray_add(spec_args, "--ld-cmd");
@@ -1064,8 +1067,16 @@ int main(int argc, char **argv)
opts.gui_app = 0;
else if (strcmp("-municode", argv[i]) == 0)
opts.unicode_app = 1;
- else if (strcmp("-m32", argv[i]) == 0 || strcmp("-m64", argv[i]) == 0)
+ else if (strcmp("-m32", argv[i]) == 0)
+ {
+ opts.force_pointer_size = 4;
raw_linker_arg = 1;
+ }
+ else if (strcmp("-m64", argv[i]) == 0)
+ {
+ opts.force_pointer_size = 8;
+ raw_linker_arg = 1;
+ }
break;
case 'n':
if (strcmp("-nostdinc", argv[i]) == 0)
More information about the wine-cvs
mailing list