Skip to content

W
wine-winehq
Commit 5a8ca9e2 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

winegcc: Don't use DLLFLAGS in winegcc.

parent 2374cd52
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
tools/winegcc/Makefile.in
View file @ 5a8ca9e2
...@@ -2,7 +2,6 @@ DEFS = \ ...@@ -2,7 +2,6 @@ DEFS = \
-DINCLUDEDIR="\"$(includedir)\"" \ -DINCLUDEDIR="\"$(includedir)\"" \
-DDLLDIR="\"$(dlldir)\"" \ -DDLLDIR="\"$(dlldir)\"" \
-DLIBDIR="\"$(libdir)\"" \ -DLIBDIR="\"$(libdir)\"" \
-DDLLFLAGS="\"@DLLFLAGS@\"" \
-DCC="\"$(CC)\"" \ -DCC="\"$(CC)\"" \
-DCPP="\"@CPPBIN@\"" \ -DCPP="\"@CPPBIN@\"" \
-DCXX="\"@CXX@\"" \ -DCXX="\"@CXX@\"" \
......
tools/winegcc/winegcc.c
View file @ 5a8ca9e2
...@@ -511,7 +511,8 @@ static void compile(struct options* opts, const char* lang) ...@@ -511,7 +511,8 @@ static void compile(struct options* opts, const char* lang)
strarray_add(comp_args, "-fshort-wchar"); strarray_add(comp_args, "-fshort-wchar");
strarray_add(comp_args, "-DWINE_UNICODE_NATIVE"); strarray_add(comp_args, "-DWINE_UNICODE_NATIVE");
} }
strarray_addall(comp_args, strarray_fromstring(DLLFLAGS, " ")); strarray_add(comp_args, "-D_REENTRANT");
strarray_add(comp_args, "-fPIC");
} }
if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64)
...@@ -1010,7 +1011,8 @@ static void build(struct options* opts) ...@@ -1010,7 +1011,8 @@ static void build(struct options* opts)
spec_o_name = get_temp_file(output_name, ".spec.o"); spec_o_name = get_temp_file(output_name, ".spec.o");
if (opts->force_pointer_size) if (opts->force_pointer_size)
strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));
strarray_addall(spec_args, strarray_fromstring(DLLFLAGS, " ")); strarray_add(spec_args, "-D_REENTRANT");
strarray_add(spec_args, "-fPIC");
strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe");
if (fake_module) if (fake_module)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment