diff --git a/Makefile b/Makefile index 2dfe82ed..a0b79767 100644 --- a/Makefile +++ b/Makefile @@ -52,10 +52,12 @@ help: @echo " vagrant - Start Vagrant VM" @echo " configure - Configure Proton build directory" @echo " proton - Build Proton" - @echo " module - Build a single Wine module and copy into the shared directory." - @echo " Note: This is a development loop target. Use it only after building" - @echo " all of wine with one of the other targets." + @echo "" + @echo " The following targets are development targets only useful after building Proton." + @echo " module - Rebuild a single Wine module and copy into vagrant_share/." @echo " Specify module variable: make module=kernel32 module" + @echo " dxvk - Rebuild DXVK and copy it into vagrant_share/." + @echo " lsteamclient - Rebuild the Steam client wrapper and copy it into vagrant_share/." @echo "" @echo "Examples:" @echo " "make install" - Build Proton and install into this user's Steam installation," @@ -102,3 +104,17 @@ module: configure vagrant ssh -c 'cp $(BUILD_DIR)/obj-wine32/dlls/$(module)/$(module)*.so /vagrant/$(module)/lib/wine/' mkdir -p vagrant_share/$(module)/lib64/wine/ vagrant ssh -c 'cp $(BUILD_DIR)/obj-wine64/dlls/$(module)/$(module)*.so /vagrant/$(module)/lib64/wine/' + +dxvk: configure + vagrant ssh -c 'make -C $(BUILD_DIR)/ dxvk' + mkdir -p vagrant_share/dxvk/lib/wine/dxvk/ + vagrant ssh -c 'cp $(BUILD_DIR)/dist/dist/lib/wine/dxvk/*.dll /vagrant/dxvk/lib/wine/dxvk/' + mkdir -p vagrant_share/dxvk/lib64/wine/dxvk/ + vagrant ssh -c 'cp $(BUILD_DIR)/dist/dist/lib64/wine/dxvk/*.dll /vagrant/dxvk/lib64/wine/dxvk/' + +lsteamclient: configure + vagrant ssh -c 'make -C $(BUILD_DIR)/ lsteamclient' + mkdir -p vagrant_share/lsteamclient/lib/wine + vagrant ssh -c 'cp $(BUILD_DIR)/dist/dist/lib/wine/lsteamclient.dll.so /vagrant/lsteamclient/lib/wine' + mkdir -p vagrant_share/lsteamclient/lib64/wine + vagrant ssh -c 'cp $(BUILD_DIR)/dist/dist/lib64/wine/lsteamclient.dll.so /vagrant/lsteamclient/lib64/wine' diff --git a/README.md b/README.md index 7126676d..20fd531d 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ can be distributed as a Proton package. This is what we use to deploy Proton to Steam users. The package will be dropped into a new directory in `vagrant_share/`, named after the nearest Git tag (see `git describe`). -`make clean` - This will completely erase the build tree. +`make clean` - This will completely erase the build tree in the VM. `make help` - View the Makefile documentation and examples. @@ -86,6 +86,8 @@ the specified module, and copy the result into the `vagrant_share` directory. This allows rapid iteration on one module. This target is only useful after building Proton. +`make dxvk` - This will rebuild DXVK and copy it into `vagrant_share`. + If you are doing significant Wine development or want to control the build with more fine detail, see the full documentation below.