- Wine-Commits - list.winehq.org

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .svg files.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 2205218b24a4eebb07f97c3b17d9310d3b3aad3f URL: https://gitlab.winehq.org/wine/wine/-/commit/2205218b24a4eebb07f97c3b17d931… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 13:47:59 2023 +0200 makefiles: Always use the global SOURCES variable for .svg files. --- dlls/appwiz.cpl/Makefile.in | 9 ++---- dlls/comctl32/Makefile.in | 27 ++++++++---------- dlls/comdlg32/Makefile.in | 14 ++++------ dlls/credui/Makefile.in | 9 ++---- dlls/hhctrl.ocx/Makefile.in | 14 ++++------ dlls/ieframe/Makefile.in | 12 +++----- dlls/inetcpl.cpl/Makefile.in | 9 ++---- dlls/joy.cpl/Makefile.in | 9 ++---- dlls/light.msstyles/Makefile.in | 7 ++--- dlls/ole32/Makefile.in | 28 ++++++++----------- dlls/riched20/Makefile.in | 13 +++------ dlls/shell32/Makefile.in | 61 +++++++++++++++++++---------------------- dlls/user32/Makefile.in | 31 ++++++++++----------- programs/cmd/Makefile.in | 8 ++---- programs/hh/Makefile.in | 10 +++---- programs/iexplore/Makefile.in | 8 ++---- programs/taskmgr/Makefile.in | 9 ++---- programs/winetest/Makefile.in | 11 +++----- programs/winhlp32/Makefile.in | 13 ++++----- programs/wordpad/Makefile.in | 11 +++----- tools/make_makefiles | 3 +- 21 files changed, 125 insertions(+), 191 deletions(-)

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .l files.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 94771cf07ad41b0f7d792559771222855ac01ba6 URL: https://gitlab.winehq.org/wine/wine/-/commit/94771cf07ad41b0f7d792559771222… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 13:50:44 2023 +0200 makefiles: Always use the global SOURCES variable for .l files. --- dlls/d3dcompiler_33/Makefile.in | 15 +++++---------- dlls/d3dcompiler_34/Makefile.in | 15 +++++---------- dlls/d3dcompiler_35/Makefile.in | 15 +++++---------- dlls/d3dcompiler_36/Makefile.in | 15 +++++---------- dlls/d3dcompiler_37/Makefile.in | 15 +++++---------- dlls/d3dcompiler_38/Makefile.in | 15 +++++---------- dlls/d3dcompiler_39/Makefile.in | 15 +++++---------- dlls/d3dcompiler_40/Makefile.in | 15 +++++---------- dlls/d3dcompiler_41/Makefile.in | 15 +++++---------- dlls/d3dcompiler_42/Makefile.in | 15 +++++---------- dlls/d3dcompiler_43/Makefile.in | 15 +++++---------- dlls/d3dcompiler_46/Makefile.in | 15 +++++---------- dlls/d3dcompiler_47/Makefile.in | 15 +++++---------- dlls/msxml3/Makefile.in | 22 ++++++++-------------- tools/make_makefiles | 4 +--- 15 files changed, 74 insertions(+), 147 deletions(-) diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in index c9aff6e7edd..5bc3b44e879 100644 --- a/dlls/d3dcompiler_33/Makefile.in +++ b/dlls/d3dcompiler_33/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in index 9d8f48e48ee..e31d74fd902 100644 --- a/dlls/d3dcompiler_34/Makefile.in +++ b/dlls/d3dcompiler_34/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in index 1da7eca6c01..49be82f2593 100644 --- a/dlls/d3dcompiler_35/Makefile.in +++ b/dlls/d3dcompiler_35/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in index 62be7b22281..30f3e183396 100644 --- a/dlls/d3dcompiler_36/Makefile.in +++ b/dlls/d3dcompiler_36/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in index e8759d9e577..072e27a86d2 100644 --- a/dlls/d3dcompiler_37/Makefile.in +++ b/dlls/d3dcompiler_37/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in index da528cc0509..a03cdd730c8 100644 --- a/dlls/d3dcompiler_38/Makefile.in +++ b/dlls/d3dcompiler_38/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index 94ec5aae839..2f9231871f1 100644 --- a/dlls/d3dcompiler_39/Makefile.in +++ b/dlls/d3dcompiler_39/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in index 10665d863ca..f6451bcad53 100644 --- a/dlls/d3dcompiler_40/Makefile.in +++ b/dlls/d3dcompiler_40/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in index 5d522857173..433a2cb03a3 100644 --- a/dlls/d3dcompiler_41/Makefile.in +++ b/dlls/d3dcompiler_41/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in index 613ddee223e..9f4f571b5bd 100644 --- a/dlls/d3dcompiler_42/Makefile.in +++ b/dlls/d3dcompiler_42/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index d02280305e8..51993fd0d79 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index 1d82dfed1d9..1466c060ebf 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -7,18 +7,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index e7df065061c..a98ca7243c1 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -7,18 +7,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 2bf789732da..7e59a223143 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -2,7 +2,7 @@ MODULE = msxml3.dll IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 EXTRAINCL = $(XSLT_PE_CFLAGS) $(XML2_PE_CFLAGS) -C_SRCS = \ +SOURCES = \ attribute.c \ bsc.c \ cdata.c \ @@ -17,6 +17,7 @@ C_SRCS = \ factory.c \ httprequest.c \ main.c \ + msxml3_v1.idl \ mxnamespace.c \ mxwriter.c \ node.c \ @@ -26,24 +27,17 @@ C_SRCS = \ pi.c \ saxreader.c \ schema.c \ + schemas.rc \ selection.c \ stylesheet.c \ text.c \ uuid.c \ + version.rc \ xdr.c \ xmldoc.c \ xmlelem.c \ xmlparser.c \ - xmlview.c - -LEX_SRCS = xslpattern.l - -BISON_SRCS = xslpattern.y - -RC_SRCS = \ - schemas.rc \ - version.rc - -IDL_SRCS = \ - msxml3_v1.idl \ - xmlparser.idl + xmlparser.idl \ + xmlview.c \ + xslpattern.l \ + xslpattern.y diff --git a/tools/make_makefiles b/tools/make_makefiles index 1e52ee1cf67..bd84414d9c5 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -338,12 +338,11 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{"$dir/Makefile.in"}; my $name = substr( $file, length($dir) + 1 ); - if ($name =~ /\.(in|m|mc|po|sfd|svg)$/) + if ($name =~ /\.(in|l|m|mc|po|sfd|svg)$/) { push @{${$make}{"=SOURCES"}}, $name; next; } - elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.c$/) { @@ -395,7 +394,6 @@ sub assign_sources_to_makefiles(@) preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "RC_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" ); - preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "LEX_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); } }

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .y files.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: ffeb530cc0bd21016d1ea718de720edb3879d8d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ffeb530cc0bd21016d1ea718de720e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 13:51:42 2023 +0200 makefiles: Always use the global SOURCES variable for .y files. --- dlls/jscript/Makefile.in | 17 ++++++----------- dlls/msi/Makefile.in | 17 ++++++----------- dlls/vbscript/Makefile.in | 13 ++++--------- dlls/wbemprox/Makefile.in | 10 ++++------ tools/make_makefiles | 4 +--- 5 files changed, 21 insertions(+), 40 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 3e019201eb8..c37b0dd69f3 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -1,10 +1,11 @@ MODULE = jscript.dll IMPORTS = oleaut32 ole32 user32 advapi32 -C_SRCS = \ +SOURCES = \ activex.c \ array.c \ bool.c \ + cc_parser.y \ compile.c \ date.c \ decode.c \ @@ -15,7 +16,10 @@ C_SRCS = \ function.c \ global.c \ jscript.c \ + jscript.rc \ + jscript_classes.idl \ jscript_main.c \ + jsglobal.idl \ json.c \ jsregexp.c \ jsstr.c \ @@ -24,17 +28,8 @@ C_SRCS = \ math.c \ number.c \ object.c \ + parser.y \ regexp.c \ set.c \ string.c \ vbarray.c - -RC_SRCS = jscript.rc - -IDL_SRCS = \ - jscript_classes.idl \ - jsglobal.idl - -BISON_SRCS = \ - cc_parser.y \ - parser.y diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 7140e5a3308..21420909a92 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -4,13 +4,14 @@ IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 EXTRAIDLFLAGS = --prefix-server=s_ -C_SRCS = \ +SOURCES = \ action.c \ alter.c \ appsearch.c \ assembly.c \ automation.c \ classes.c \ + cond.y \ create.c \ custom.c \ database.c \ @@ -26,8 +27,10 @@ C_SRCS = \ install.c \ media.c \ msi.c \ + msi.rc \ msi_main.c \ msiquery.c \ + msiserver.idl \ package.c \ patch.c \ record.c \ @@ -35,6 +38,7 @@ C_SRCS = \ script.c \ select.c \ source.c \ + sql.y \ storages.c \ streams.c \ string.c \ @@ -43,14 +47,5 @@ C_SRCS = \ tokenize.c \ update.c \ upgrade.c \ - where.c - -IDL_SRCS = \ - msiserver.idl \ + where.c \ winemsi.idl - -BISON_SRCS = \ - cond.y \ - sql.y - -RC_SRCS = msi.rc diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index a6a0569cc03..0dcc928460b 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -3,25 +3,20 @@ IMPORTS = oleaut32 ole32 user32 EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ compile.c \ global.c \ interp.c \ lex.c \ + parser.y \ regexp.c \ utils.c \ vbdisp.c \ vbregexp.c \ vbscript.c \ - vbscript_main.c - -BISON_SRCS = \ - parser.y - -RC_SRCS = vbscript.rc - -IDL_SRCS = \ + vbscript.rc \ vbscript_classes.idl \ + vbscript_main.c \ vbsglobal.idl \ vbsregexp10.idl \ vbsregexp55.idl diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 48a43646491..53835c748ff 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,7 +1,7 @@ MODULE = wbemprox.dll IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi -C_SRCS = \ +SOURCES = \ builtin.c \ class.c \ main.c \ @@ -14,8 +14,6 @@ C_SRCS = \ services.c \ sysrestore.c \ table.c \ - wbemlocator.c - -IDL_SRCS = wbemprox.idl - -BISON_SRCS = wql.y + wbemlocator.c \ + wbemprox.idl \ + wql.y diff --git a/tools/make_makefiles b/tools/make_makefiles index bd84414d9c5..0e4a31648c3 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -338,12 +338,11 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{"$dir/Makefile.in"}; my $name = substr( $file, length($dir) + 1 ); - if ($name =~ /\.(in|l|m|mc|po|sfd|svg)$/) + if ($name =~ /\.(in|l|m|mc|po|sfd|svg|y)$/) { push @{${$make}{"=SOURCES"}}, $name; next; } - elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $name; @@ -394,7 +393,6 @@ sub assign_sources_to_makefiles(@) preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "RC_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" ); - preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); } }

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .man.in files.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 4e9f1a41b9d828ddc17463e01efc46ece175adca URL: https://gitlab.winehq.org/wine/wine/-/commit/4e9f1a41b9d828ddc17463e01efc46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 13:43:34 2023 +0200 makefiles: Always use the global SOURCES variable for .man.in files. --- programs/msiexec/Makefile.in | 11 ++++------- programs/notepad/Makefile.in | 13 +++++-------- programs/regedit/Makefile.in | 11 ++++------- programs/regsvr32/Makefile.in | 10 ++++------ programs/wineboot/Makefile.in | 10 ++++------ programs/winecfg/Makefile.in | 14 +++++--------- programs/wineconsole/Makefile.in | 10 ++++------ programs/winedbg/Makefile.in | 15 ++++++--------- programs/winefile/Makefile.in | 13 +++++-------- programs/winemine/Makefile.in | 13 +++++-------- programs/winepath/Makefile.in | 6 +++--- server/Makefile.in | 8 +++----- tools/make_makefiles | 11 +---------- tools/widl/Makefile.in | 17 ++++++----------- tools/winebuild/Makefile.in | 6 +++--- tools/winedump/Makefile.in | 6 +++--- tools/winegcc/Makefile.in | 9 ++++----- tools/winemaker/Makefile.in | 2 +- tools/wmc/Makefile.in | 7 +++---- tools/wrc/Makefile.in | 19 +++++++------------ 20 files changed, 80 insertions(+), 131 deletions(-)

1 0

Giovanni Mascellani : ci: Run tests using dxcompiler.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: vkd3d Branch: master Commit: 1bd8baf4209892d9828b8e88d24ec69d03bf8acb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1bd8baf4209892d9828b8e88d24ec… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 2 14:07:28 2023 +0200 ci: Run tests using dxcompiler. The dxcompiler is only used for 64 bit builds, because no official 32 bit implementation is distributed. This might change in the future building the compiler ourselves and using vkd3d-shader to sign the generated shaders. --- gitlab/build-linux | 3 ++- gitlab/image.docker | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gitlab/build-linux b/gitlab/build-linux index 9a26849c..ee00e61e 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -11,7 +11,8 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure --enable-demos CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ +export LD_LIBRARY_PATH=/usr/local/lib +../configure --enable-demos DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ make -j$(nproc) && \ make -j$(nproc) check || \ touch ../pipeline_failed diff --git a/gitlab/image.docker b/gitlab/image.docker index ec63dee4..b7e40ee0 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -14,7 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ apt-get update && \ apt-get dist-upgrade -y && \ apt-get install -y build-essential pkg-config gcc-multilib gcc-mingw-w64 \ - autoconf automake libtool flex bison \ + autoconf automake libtool flex bison curl \ git ca-certificates rsync \ doxygen doxygen-latex graphviz \ mesa-vulkan-drivers mesa-vulkan-drivers:i386 \ @@ -35,6 +35,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ cd ../.. && \ rm -rf wine && \ apt-get clean && \ + curl -L -s https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2… | tar zx -C /usr/local ./lib/libdxcompiler.so ./lib/libdxil.so && \ groupadd host-render -g 800 && \ useradd -m gitlab -G host-render

1 0

Giovanni Mascellani : ci: Build the DXIL parser.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: vkd3d Branch: master Commit: 680a5aaa78943d78d7257fe873590b4e07fb813d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/680a5aaa78943d78d7257fe873590… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Oct 4 12:51:02 2023 +0200 ci: Build the DXIL parser. --- gitlab/build-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/build-linux b/gitlab/build-linux index 661180f5..9a26849c 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -11,7 +11,7 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure --enable-demos CFLAGS="-g -O2 -Werror" && \ +../configure --enable-demos CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ make -j$(nproc) && \ make -j$(nproc) check || \ touch ../pipeline_failed

1 0

Giovanni Mascellani : ci: Build widl for 64 bit.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: vkd3d Branch: master Commit: 1ee0cbb627997694263be5e3b0f857bb04c36482 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1ee0cbb627997694263be5e3b0f85… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 26 16:33:09 2023 +0200 ci: Build widl for 64 bit. --- gitlab/image.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/image.docker b/gitlab/image.docker index dd6923cb..ec63dee4 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -29,7 +29,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ cd wine && \ mkdir build && \ cd build && \ - ../configure --without-x --without-freetype && \ + ../configure --enable-win64 --without-x --without-freetype && \ make tools/widl/widl && \ cp tools/widl/widl /usr/local/bin && \ cd ../.. && \

1 0

Giovanni Mascellani : tests: Fail if dxcompiler is not available at runtime.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: vkd3d Branch: master Commit: c1de65a99ba851f97cb5f345b66a2bba1fc98fc2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c1de65a99ba851f97cb5f345b66a2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 2 14:08:44 2023 +0200 tests: Fail if dxcompiler is not available at runtime. --- tests/shader_runner.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index cae0bf02..423f42bd 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1457,23 +1457,20 @@ static IDxcCompiler3 *dxcompiler_create() HRESULT hr; void *dll; - if (!(dll = vkd3d_dlopen(SONAME_LIBDXCOMPILER))) - { - trace("Failed to load dxcompiler library, %s.\n", vkd3d_dlerror()); + dll = vkd3d_dlopen(SONAME_LIBDXCOMPILER); + ok(dll, "Failed to load dxcompiler library, %s.\n", vkd3d_dlerror()); + if (!dll) return NULL; - } - if (!(create_instance = (DxcCreateInstanceProc)vkd3d_dlsym(dll, "DxcCreateInstance"))) - { - trace("Failed to get DxcCreateInstance() pointer.\n"); + create_instance = (DxcCreateInstanceProc)vkd3d_dlsym(dll, "DxcCreateInstance"); + ok(create_instance, "Failed to get DxcCreateInstance() pointer.\n"); + if (!create_instance) return NULL; - } - if (FAILED(hr = create_instance(&CLSID_DxcCompiler, &IID_IDxcCompiler3, (void **)&compiler))) - { - trace("Failed to create instance, hr %#x.\n", hr); + hr = create_instance(&CLSID_DxcCompiler, &IID_IDxcCompiler3, (void **)&compiler); + ok(SUCCEEDED(hr), "Failed to create instance, hr %#x.\n", hr); + if (FAILED(hr)) return NULL; - } return compiler; }

1 0

Tag wine-8.18 : Alexandre Julliard : Release 8.18
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: refs/tags/wine-8.18 Tag: f13b73c535fe4c1d5176422aa4ea707f2270d6d5 URL: https://gitlab.winehq.org/wine/wine/-/tags/f13b73c535fe4c1d5176422aa4ea707f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 13 23:00:12 2023 +0200 Release 8.18

1 0

Alexandre Julliard : Release 8.18.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 9d78031de6261f29d42e18db04f9925cfba24108 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d78031de6261f29d42e18db04f992… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 13 23:00:12 2023 +0200 Release 8.18. --- ANNOUNCE | 746 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 382 insertions(+), 384 deletions(-)

1 0