Skip to content

Commit

Permalink
Fix CnCNetQM launch on *nix systems
Browse files Browse the repository at this point in the history
  • Loading branch information
Belonit committed Aug 23, 2023
1 parent 31a8ba8 commit bb17297
Show file tree
Hide file tree
Showing 40 changed files with 27 additions and 10 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
* text=crlf

version text eol=crlf
*.xdp text eol=crlf
*.cfg text eol=crlf
*.ini text eol=crlf
*.map text eol=crlf
*.txt text eol=crlf
*.json text eol=crlf
preupdateexec text eol=crlf
updateexec text eol=crlf
version text eol=crlf

*.sh text eol=lf
*.ps1 eol=lf
13 changes: 13 additions & 0 deletions package/Qt/CnCNetQM-wine.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh

# Uncomment next line to create a detached prefix
# export WINEPREFIX=${PWD}/wineprefix/

# Set win7 windows version for gamemd-spawn.exe and CnCNetQM.exe
${WINE:=wine} reg add HKEY_CURRENT_USER\\Software\\Wine\\AppDefaults\\gamemd-spawn.exe /v Version /d win7 /f
${WINE:=wine} reg add HKEY_CURRENT_USER\\Software\\Wine\\AppDefaults\\CnCNetQM.exe /v Version /d win7 /f

# Set native,builtin for ddraw override option for gamemd-spawn.exe
${WINE:=wine} reg add HKEY_CURRENT_USER\\Software\\Wine\\AppDefaults\\gamemd-spawn.exe\\DllOverrides /v ddraw /d native,builtin /f

${WINE:=wine} ./Qt/CnCNetQM.exe
Binary file modified package/Resources/Binaries/OpenGL/ClientCore.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/OpenGL/ClientCore.pdb
Binary file not shown.
Binary file modified package/Resources/Binaries/OpenGL/ClientGUI.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/OpenGL/ClientGUI.pdb
Binary file not shown.
Binary file modified package/Resources/Binaries/OpenGL/DTAConfig.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/OpenGL/DTAConfig.pdb
Binary file not shown.
4 changes: 2 additions & 2 deletions package/Resources/Binaries/OpenGL/clientogl.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v7.0": {
"clientogl/2.8.0-beta0220": {
"clientogl/2.8.0-beta0221": {
"dependencies": {
"DTAConfig": "2.2.0",
"DiscordRichPresence": "1.1.3.18",
Expand Down Expand Up @@ -1284,7 +1284,7 @@
}
},
"libraries": {
"clientogl/2.8.0-beta0220": {
"clientogl/2.8.0-beta0221": {
"type": "project",
"serviceable": false,
"sha512": ""
Expand Down
Binary file modified package/Resources/Binaries/OpenGL/clientogl.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/OpenGL/clientogl.pdb
Binary file not shown.
Binary file modified package/Resources/Binaries/UniversalGL/ClientCore.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/UniversalGL/ClientCore.pdb
Binary file not shown.
Binary file modified package/Resources/Binaries/UniversalGL/ClientGUI.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/UniversalGL/ClientGUI.pdb
Binary file not shown.
Binary file modified package/Resources/Binaries/UniversalGL/DTAConfig.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/UniversalGL/DTAConfig.pdb
Binary file not shown.
4 changes: 2 additions & 2 deletions package/Resources/Binaries/UniversalGL/clientogl.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v7.0": {
"clientogl/2.8.0-beta0220": {
"clientogl/2.8.0-beta0221": {
"dependencies": {
"DTAConfig": "2.2.0",
"DiscordRichPresence": "1.1.3.18",
Expand Down Expand Up @@ -1375,7 +1375,7 @@
}
},
"libraries": {
"clientogl/2.8.0-beta0220": {
"clientogl/2.8.0-beta0221": {
"type": "project",
"serviceable": false,
"sha512": ""
Expand Down
Binary file modified package/Resources/Binaries/UniversalGL/clientogl.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/UniversalGL/clientogl.pdb
Binary file not shown.
Binary file modified package/Resources/Binaries/Windows/ClientCore.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/Windows/ClientCore.pdb
Binary file not shown.
Binary file modified package/Resources/Binaries/Windows/ClientGUI.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/Windows/ClientGUI.pdb
Binary file not shown.
Binary file modified package/Resources/Binaries/Windows/DTAConfig.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/Windows/DTAConfig.pdb
Binary file not shown.
4 changes: 2 additions & 2 deletions package/Resources/Binaries/Windows/clientdx.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v7.0": {
"clientdx/2.8.0-beta0220": {
"clientdx/2.8.0-beta0221": {
"dependencies": {
"DTAConfig": "2.2.0",
"DiscordRichPresence": "1.1.3.18",
Expand Down Expand Up @@ -2008,7 +2008,7 @@
}
},
"libraries": {
"clientdx/2.8.0-beta0220": {
"clientdx/2.8.0-beta0221": {
"type": "project",
"serviceable": false,
"sha512": ""
Expand Down
Binary file modified package/Resources/Binaries/Windows/clientdx.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/Windows/clientdx.pdb
Binary file not shown.
Binary file modified package/Resources/Binaries/XNA/ClientCore.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/XNA/ClientCore.pdb
Binary file not shown.
Binary file modified package/Resources/Binaries/XNA/ClientGUI.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/XNA/ClientGUI.pdb
Binary file not shown.
Binary file modified package/Resources/Binaries/XNA/DTAConfig.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/XNA/DTAConfig.pdb
Binary file not shown.
4 changes: 2 additions & 2 deletions package/Resources/Binaries/XNA/clientxna.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"targets": {
".NETCoreApp,Version=v7.0": {},
".NETCoreApp,Version=v7.0/win-x86": {
"clientxna/2.8.0-beta0220": {
"clientxna/2.8.0-beta0221": {
"dependencies": {
"DTAConfig": "2.2.0",
"DiscordRichPresence": "1.1.3.18",
Expand Down Expand Up @@ -1427,7 +1427,7 @@
}
},
"libraries": {
"clientxna/2.8.0-beta0220": {
"clientxna/2.8.0-beta0221": {
"type": "project",
"serviceable": false,
"sha512": ""
Expand Down
Binary file modified package/Resources/Binaries/XNA/clientxna.dll
Binary file not shown.
Binary file modified package/Resources/Binaries/XNA/clientxna.pdb
Binary file not shown.
3 changes: 2 additions & 1 deletion package/Resources/MainMenu.ini
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ FontIndex=1
[btnQuickmatch]
Location=645,241
Text=Ranked Match
URL=Qt\CnCNetQM.exe
URL=Qt/CnCNetQM.exe
UnixURL=Qt/CnCNetQM-wine.sh

IdleTexture=MainMenu\button.png
HoverTexture=MainMenu\button_c.png
Expand Down
1 change: 0 additions & 1 deletion package/Resources/yr-wine.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/sh


# Uncomment next line to create a detached prefix
# export WINEPREFIX=${PWD}/wineprefix/

Expand Down

0 comments on commit bb17297

Please sign in to comment.