Commit Graph
380 Commits
Author SHA1 Message Date
John Schoenick 8ee0eea90c build/makefile_base.mak: Fix dxvk error when reconfiguring
If the makefile changes, dxvk tries to reconfigure (since the passed
args may be different), but meson only allows that with --reconfigure

Also fixes 'make dxvk_configure' multiple times
2018-10-17 16:58:05 -07:00
John Schoenick 78d2210b1f build/makefile_base.mak: Print a message during deploy step
Largely for my testing that 'make all deploy' was doing things right,
but mildly helpful and matches install step.
2018-10-17 16:58:05 -07:00
John Schoenick 4adf44a16f build/makefile_base.mak: Ensure the install/dist steps run last
Such that 'make all deploy' or 'make all deploy install' work as
expected

Deploy/install don't imply all however - if iterating you may wish to
do e.g. 'make dxvk deploy' without waiting for a no-op wine build.

Ideally we'd track OUT files for everything, however, so a 'make
deploy' could at least build missing targets, if not dirty them.

The dist target would seem to need this treatment at first glance, but
it is actually doing prepare steps that only depend on wine being
ready
2018-10-17 16:58:05 -07:00
John Schoenick c3053292b5 build/makefile_base.mak: Add some missing dist subdirectories
Fixes some races in parallel builds

These could all be listed in OBJ_DIRS above, but for specific nested
subdirectories having a mkdir -pv there is less error prone, if
verbose.
2018-10-17 16:58:05 -07:00
John Schoenick b431ee2bab build/makefile_base.mak: Fix parallel lsteamclient builds
Use silly symlink-dir workaround since winemaker's directory/project
behavior is pretty fragile
2018-10-17 16:58:05 -07:00
Andrew Eikum 56b174af54 makefile: Enable sse optimizations 2018-10-17 14:23:15 -05:00
Andrew Eikum 0fe9dca863 update wine 2018-10-17 14:23:15 -05:00
Andrew Eikum 22e0e3f0ab makefile: Configure DXVK in release mode directly 2018-10-17 14:23:15 -05:00
Steven Noonan dff8cce67b makefile_base: allow using "make -jN"
We didn't prefix any of our submake $(MAKE) invocations with +, so the
jobserver couldn't be used.

This also (so far?) seems to fix some problems I had with "make -j16"
(or anything higher than -j4) breaking due to some vrclient/steamclient
linkage problems.

Signed-off-by: Steven Noonan <steven@valvesoftware.com>
2018-10-17 11:48:02 -07:00
Andrew Eikum c8d12e78a7 Merge branch 'proton_3.16-next' into proton_3.16 2018-10-16 10:56:07 -05:00
Andrew Eikum 3a0cbf0038 update wine 2018-10-16 09:44:32 -05:00
NoXPhasma cac3a518bd Allow override of dlls with WINEDLLOVERRIDES environment variable
Proton overrides the environment variable WINEDLLOVERRIDES entirely,
this change allows to add own dll overrides.
2018-10-16 09:44:32 -05:00
Seppo Yli-Olli aaaef10ccb Simplify XDG_CONFIG_HOME handling 2018-10-16 09:44:32 -05:00
Andrew Eikum 341bdd2296 update dxvk to 0.90 2018-10-16 09:44:32 -05:00
Andrew Eikum e5f38f9f4c proton: Use DXVK for d3d10 as well. 2018-10-16 09:44:32 -05:00
Kai Krakow f7ea4cb866 proton: Correct wined3d symlinks 2018-10-16 07:50:33 -05:00
Andrew Eikum cc3e4210cd Revert "build dxvk as native .so"
This reverts commits aef98f1e7d and f85b734f66.

The Steam Runtime is too old to build DXVK, so we have to continue
building it as a Windows DLL.
2018-10-16 07:50:33 -05:00
Pierre-Loup A. Griffais 93bfce4869 Update CHANGELOG.md 2018-10-13 08:31:22 -07:00
Pierre-Loup A. Griffais 931984d61a Update CHANGELOG.md 2018-10-13 07:58:03 -07:00
Steven Noonan 7bfeb7f94d fix namespace collision for multiple proton installs
Signed-off-by: Steven Noonan <steven@valvesoftware.com>
2018-10-13 00:27:52 -07:00
Steven Noonan b3ecf24bc3 makefile_base: ensure version gets copied into DST_BASE
The main "proton" script tries to compare the version file in DST_BASE
with the one in DST_DIR, but the one in DST_BASE was missing, causing it
to fail to run anything.

Signed-off-by: Steven Noonan <steven@valvesoftware.com>
2018-10-12 23:43:35 -07:00
Andrew Eikum eda71eee45 makefile: Disable ccache for now
Doesn't play well with multiple Docker containers with the same temp
dirs. Maybe fixed in a new ccache or we can work around with
CCACHE_TEMPDIR.
2018-10-12 08:44:37 -05:00
Andrew Eikum 012b6af070 update dxvk to 0.81 plus xfb support 2018-10-12 08:44:37 -05:00
Andrew Eikum 09ec99d38b update wine 2018-10-12 08:30:19 -05:00
Andrew Eikum 31706aef86 proton: Python cleanup 2018-10-12 08:30:19 -05:00