Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-26 06:35:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix namespace collision for multiple proton installs

Browse Source 
Signed-off-by: Steven Noonan <steven@valvesoftware.com>
This commit is contained in:
Steven Noonan 2018-10-13 00:27:52 -07:00
parent b3ecf24bc3
commit 7bfeb7f94d
No known key found for this signature in database
GPG Key ID: 7EACB44BA7B30DB9
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/makefile_base.mak
View File

@ -263,7 +263,7 @@ $(DIST_VERSION): | $(DST_DIR)
cp $(DIST_VERSION) $(DST_BASE)/ cp $(DIST_VERSION) $(DST_BASE)/
$(DIST_COMPAT_MANIFEST): $(COMPAT_MANIFEST_TEMPLATE) $(MAKEFILE_DEP) | $(DST_DIR) $(DIST_COMPAT_MANIFEST): $(COMPAT_MANIFEST_TEMPLATE) $(MAKEFILE_DEP) | $(DST_DIR)
sed -r 's|//##DISPLAY_NAME##|"display_name" "'$(BUILD_NAME)'"|' $< > $@ sed -r 's|##BUILD_NAME##|$(BUILD_NAME)|' $< > $@
$(DIST_GECKO_DIR): $(DIST_GECKO_DIR):
mkdir -p $@ mkdir -p $@

6
compatibilitytool.vdf.template
View File

@ -2,7 +2,7 @@
{ {
"compat_tools" "compat_tools"
{ {
"proton-localbuild" // Internal name of this tool "##BUILD_NAME##" // Internal name of this tool
{ {
// Can register this tool with Steam in two ways: // Can register this tool with Steam in two ways:
// //
@ -14,9 +14,7 @@
"install_path" "." "install_path" "."
// For this template, we're going to substitute the display_name key in here, e.g.: // For this template, we're going to substitute the display_name key in here, e.g.:
// "display_name" "Proton - local build 3/2" "display_name" "##BUILD_NAME##"
//##DISPLAY_NAME##
"from_oslist" "windows" "from_oslist" "windows"
"to_oslist" "linux" "to_oslist" "linux"