Skip to content

W
wine-cw
Commit a286c202 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

Fix dll handling.

Take DLL_PATH and LIBRARIES into account. Simplify a check for paths that don't start with a '/'.
parent 989960f7
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
tools/winemaker
View file @ a286c202
...@@ -798,6 +798,8 @@ sub source_scan_directory($$$$) ...@@ -798,6 +798,8 @@ sub source_scan_directory($$$$)
@$target[$T_TYPE]=$TT_DLL; @$target[$T_TYPE]=$TT_DLL;
push @local_depends,"$target_name.so"; push @local_depends,"$target_name.so";
push @local_dlls,$target_name; push @local_dlls,$target_name;
my $canon=canonize($target_name);
push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:%=%.spec)");
} else { } else {
@$target[$T_TYPE]=$opt_target_type; @$target[$T_TYPE]=$opt_target_type;
push @exe_list,$target; push @exe_list,$target;
...@@ -1074,7 +1076,7 @@ sub search_from($$) ...@@ -1074,7 +1076,7 @@ sub search_from($$)
if ($dirname eq "" or $dirname eq ".") { if ($dirname eq "" or $dirname eq ".") {
$dirname=cwd; $dirname=cwd;
} elsif ($dirname =~ m+^[^/]+) { } elsif ($dirname !~ m+^/+) {
$dirname=cwd . "/" . $dirname; $dirname=cwd . "/" . $dirname;
} }
if ($dirname !~ m+/$+) { if ($dirname !~ m+/$+) {
...@@ -1552,7 +1554,7 @@ sub generate_list($$$;$) ...@@ -1552,7 +1554,7 @@ sub generate_list($$$;$)
} }
## ##
# Generates a project's Makefile.in and all the target files # Generates a project's Makefile and all the target files
sub generate_project_files($) sub generate_project_files($)
{ {
my $project=$_[0]; my $project=$_[0];
...@@ -1739,7 +1741,8 @@ sub generate_project_files($) ...@@ -1739,7 +1741,8 @@ sub generate_project_files($)
print FILEO "\n"; print FILEO "\n";
if (@{@$project[$P_TARGETS]} > 0) { if (@{@$project[$P_TARGETS]} > 0) {
print FILEO "### Target specific build rules\n\n"; print FILEO "### Target specific build rules\n";
print FILEO "DEFLIB = \$(LIBRARY_PATH) \$(LIBRARIES) \$(DLL_PATH)\n\n";
foreach my $target (@{@$project[$P_TARGETS]}) { foreach my $target (@{@$project[$P_TARGETS]}) {
my $canon=canonize("@$target[$T_NAME]"); my $canon=canonize("@$target[$T_NAME]");
$canon =~ s/_so$//; $canon =~ s/_so$//;
...@@ -1753,7 +1756,7 @@ sub generate_project_files($) ...@@ -1753,7 +1756,7 @@ sub generate_project_files($)
} else { } else {
print FILEO "\t\$(CC)"; print FILEO "\t\$(CC)";
} }
print FILEO " \$(${canon}_LDFLAGS) -o \$\@ \$(${canon}_OBJS) \$(${canon}_MODULE).dbg.o \$(${canon}_LIBRARY_PATH) \$(LIBRARY_PATH) \$(${canon}_DLLS:%=-l%) \$(${canon}_LIBRARIES:%=-l%)\n"; print FILEO " \$(${canon}_LDFLAGS) -o \$\@ \$(${canon}_OBJS) \$(${canon}_MODULE).dbg.o \$(${canon}_LIBRARY_PATH) \$(DEFLIB) \$(${canon}_DLLS:%=-l%) \$(${canon}_LIBRARIES:%=-l%)\n";
print FILEO "\n\n"; print FILEO "\n\n";
} }
} }
......
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