diff --git a/.gitmodules b/.gitmodules index 7e76b5b0..cc846c00 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,24 +4,9 @@ [submodule "dxvk"] path = dxvk url = https://github.com/ValveSoftware/dxvk/ -[submodule "freetype2"] - path = freetype2 - url = https://git.savannah.nongnu.org/r/freetype/freetype2.git/ -[submodule "libpng"] - path = libpng - url = https://github.com/glennrp/libpng.git -[submodule "libjpeg-turbo"] - path = libjpeg-turbo - url = https://github.com/libjpeg-turbo/libjpeg-turbo.git -[submodule "SDL-mirror"] - path = SDL-mirror - url = https://github.com/spurious/SDL-mirror.git [submodule "openal-soft"] path = openal-soft url = https://github.com/kcat/openal-soft.git -[submodule "MoltenVK"] - path = MoltenVK - url = https://github.com/KhronosGroup/MoltenVK.git [submodule "ffmpeg"] path = ffmpeg url = https://git.ffmpeg.org/ffmpeg.git diff --git a/MoltenVK b/MoltenVK deleted file mode 160000 index 8d9ee9b5..00000000 --- a/MoltenVK +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8d9ee9b5184ab2df1f339d8413475b8168b868b3 diff --git a/README.md b/README.md index d21f1d13..37419160 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ Introduction --- Proton is a tool for use with the Steam client which allows games which are -exclusive to Windows to run on Linux and macOS operating systems. It uses Wine -to facilitate this. +exclusive to Windows to run on the Linux operating system. It uses Wine to +facilitate this. Most users will prefer to use Proton provided by the Steam client itself. The source code is provided to enable advanced users the ability to alter @@ -39,9 +39,6 @@ After cloning the Proton git repository, the next step will be to obtain the various submodules that go into building Proton: cd proton - #for linux: - git submodule update --init wine dxvk ffmpeg openal-soft openvr - #for macos: git submodule update --init If you wish to change any subcomponent, now is the time to do so. @@ -49,7 +46,7 @@ For example, if you wish make changes to Wine, you would apply those changes to the wine/ directory. --- -Building for Linux +Building --- To build Proton for Linux, set up a Debian machine with the Steam runtime and chroots as documented in the Steam Runtime repository: @@ -133,24 +130,6 @@ chroot. However, dxvk will not build in that environment, so the build_proton.s script will build it on your local system. This will require you to be able to build dxvk on your local system; refer to [the dxvk README.md](https://github.com/ValveSoftware/dxvk/blob/master/README.md) for more details. ---- -Building for macOS ---- -To build Proton for macOS, install the latest Xcode command line tools, as -well as cmake (for openal-soft), a recent nasm (for libjpeg-turbo), libtool, and automake. You can -use a packager like [Homebrew](https://brew.sh/) to find these packages. - - brew install cmake nasm libtool automake - -Then run: - - ./build_proton.sh - -TODO - Surely there are other dependencies we have not listed there. - -It is important to examine the output near the end of -build/wine.win{64,32}/config.log to ensure that you have all of the -relevant libraries required to build Wine properly. --- Deploying diff --git a/SDL-mirror b/SDL-mirror deleted file mode 160000 index 14531cf0..00000000 --- a/SDL-mirror +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 14531cf0fcdac6939d1d511d478c795a05cea34f diff --git a/dist.LICENSE.lin b/dist.LICENSE similarity index 100% rename from dist.LICENSE.lin rename to dist.LICENSE diff --git a/dist.LICENSE.osx b/dist.LICENSE.osx deleted file mode 100644 index 0a7da809..00000000 --- a/dist.LICENSE.osx +++ /dev/null @@ -1,112 +0,0 @@ -Copyright (c) 2018, Valve Corporation -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Browse the source code for more information - - https://github.com/ValveSoftware/Proton/ - ----- ---- ---- ---- - -This software contains Wine licensed under the LGPL 2.1. Wine is - - Copyright (c) 1993-2018 the Wine project authors - -Browse the source code for more information - - https://github.com/ValveSoftware/wine/ - ----- ---- ---- ---- - -This software contains DXVK licensed under the zlib/libpng license. DXVK is - - Copyright (c) 2017 Philip Rebohle - -Visit DXVK at - - https://github.com/doitsujin/dxvk/ - ----- ---- ---- ---- - -This software contains libSDL2 licensed under the zlib license. Visit libSDL at - - https://libsdl.org/ - ----- ---- ---- ---- - -This software contains FreeType2 licensed under the FreeType License. - -Portions of this software are copyright © 2018 The FreeType Project -(www.freetype.org). All rights reserved. - ----- ---- ---- ---- - -This software is based in part on the work of the Independent JPEG Group. - -Visit the libjpeg-turbo homepage at - - https://libjpeg-turbo.org/ - ----- ---- ---- ---- - -This software is based in part on the work of the libpng authors. - -Visit the libpng homepage at - - http://libpng.org/pub/png/libpng.html - ----- ---- ---- ---- - -Parts of this software are based on the OpenVR SDK, which is - - Copyright (c) 2015, Valve Corporation - -Visit OpenVR at - - https://github.com/ValveSoftware/openvr/ - ----- ---- ---- ---- - -This software contains FFmpeg licensed under the LGPL 2.1. - -Visit FFmpeg at - - https://ffmpeg.org/ - ----- ---- ---- ---- - -This software contains openal-soft licensed under the LGPL 2. - -Visit openal-soft at - - https://github.com/kcat/openal-soft/ - ----- ---- ---- ---- - -Parts of this software are based on the AMD AGS library, which is - - Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved. diff --git a/freetype2 b/freetype2 deleted file mode 160000 index 67a42aa8..00000000 --- a/freetype2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 67a42aa8879697c2bd190d213f873f0e9712589f diff --git a/libjpeg-turbo b/libjpeg-turbo deleted file mode 160000 index bf6c7743..00000000 --- a/libjpeg-turbo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bf6c774305c9feb30cff7b99e1a475df61bfa008 diff --git a/libpng b/libpng deleted file mode 160000 index b78804f9..00000000 --- a/libpng +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b78804f9a2568b270ebd30eca954ef7447ba92f7 diff --git a/proton.in b/proton similarity index 99% rename from proton.in rename to proton index 5d75009c..abd3c558 100755 --- a/proton.in +++ b/proton @@ -1,4 +1,4 @@ -#!/usr/bin/env @PYTHON_NAME@ +#!/usr/bin/env python3 #script to launch Wine with the correct environment