mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 19eaed6a3833a7bff780ccc31800cad2ecfd48d4.
This commit is contained in:
parent
8aa631da85
commit
9a2af99c65
@ -535,7 +535,7 @@ index 78b6dea..cb77784 100755
|
||||
+++ b/tools/make_makefiles
|
||||
@@ -204,7 +204,7 @@ sub parse_makefile($)
|
||||
{
|
||||
die "Configure substitution is not allowed in $file";
|
||||
die "Configure substitution is not allowed in $file" unless $file eq "Makefile";
|
||||
}
|
||||
- if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/)
|
||||
+ if (/^\s*(MODULE|IMPORTLIB|TESTDLL|RESOURCE|PARENTSRC|APPMODE)\s*=\s*(.*)/)
|
||||
|
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "097006b1466854fbd80af8d85a729d85ec52b163"
|
||||
echo "19eaed6a3833a7bff780ccc31800cad2ecfd48d4"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
Loading…
x
Reference in New Issue
Block a user