Merge branch 'dev' into dev

This commit is contained in:
alex47exe 2024-08-19 13:15:27 +01:00 committed by GitHub
commit 4f521cf0cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 197 additions and 134 deletions

View File

@ -1,40 +1,42 @@
# Many thanks for these sources
- [third-party\build\win\cert\openssl](#third-party\build\win\cert\openssl)
- [third-party\build\win\cert\signtool](#third-party\build\win\cert\signtool)
- [third-party\common\linux\premake](#third-party\common\linux\premake)
- [third-party\common\win\premake](#third-party\common\win\premake)
- [third-party\common\win\vswhere](#third-party\common\win\vswhere)
- [third-party\deps\common\curl](#third-party\deps\common\curl)
- [third-party\deps\common\ingame_overlay](#third-party\deps\common\ingame_overlay)
- [third-party\deps\common\libssq](#third-party\deps\common\libssq)
- [third-party\deps\common\mbedtls](#third-party\deps\common\mbedtls)
- [third-party\deps\common\protobuf](#third-party\deps\common\protobuf)
- [third-party\deps\common\zlib](#third-party\deps\common\zlib)
- [third-party\deps\linux\7za](#third-party\deps\linux\7za)
- [third-party\deps\linux\cmake](#third-party\deps\linux\cmake)
- [third-party\deps\win\7za](#third-party\deps\win\7za)
- [third-party\deps\win\cmake](#third-party\deps\win\cmake)
- [libs\detours](#libs\detours)
- [libs\fifo_map](#libs\fifo_map)
- [libs\gamepad](#libs\gamepad)
- [libs\imgui](#libs\imgui)
- [libs\json](#libs\json)
- [libs\sha](#libs\sha)
- [libs\simpleini](#libs\simpleini)
- [libs\stb](#libs\stb)
- [libs\utfcpp](#libs\utfcpp)
- [tools\steamclient_loader](#tools\steamclient_loader)
- [third-party\build\win\cert\openssl](#third-partybuildwincertopenssl)
- [third-party\build\win\cert\signtool](#third-partybuildwincertsigntool)
- [third-party\common\linux\premake](#third-partycommonlinuxpremake)
- [third-party\common\win\premake](#third-partycommonwinpremake)
- [third-party\common\win\vswhere](#third-partycommonwinvswhere)
- [third-party\deps\common\curl](#third-partydepscommoncurl)
- [third-party\deps\common\ingame_overlay](#third-partydepscommoningame_overlay)
- [third-party\deps\common\libssq](#third-partydepscommonlibssq)
- [third-party\deps\common\mbedtls](#third-partydepscommonmbedtls)
- [third-party\deps\common\protobuf](#third-partydepscommonprotobuf)
- [third-party\deps\common\zlib](#third-partydepscommonzlib)
- [third-party\deps\linux\7za](#third-partydepslinux7za)
- [third-party\deps\linux\cmake](#third-partydepslinuxcmake)
- [third-party\deps\win\7za](#third-partydepswin7za)
- [third-party\deps\win\cmake](#third-partydepswincmake)
- [libs\detours](#libsdetours)
- [libs\fifo_map](#libsfifo_map)
- [libs\gamepad](#libsgamepad)
- [libs\imgui](#libsimgui)
- [libs\json](#libsjson)
- [libs\sha](#libssha)
- [libs\simpleini](#libssimpleini)
- [libs\stb](#libsstb)
- [libs\utfcpp](#libsutfcpp)
- [tools\steamclient_loader](#toolssteamclient_loader)
### third-party\build\win\cert\openssl
============================================================================ INFO
#### INFO
https://github.com/openssl/openssl
VERSION: https://github.com/openssl/openssl/tree/openssl-3.3.1
Pre-compiled binaries provided by Shining Light Productions (https://slproweb.com/products/Win32OpenSSL.html)
============================================================================ LICENSE
#### LICENSE
Apache License
Version 2.0, January 2004
https://www.apache.org/licenses/
@ -214,19 +216,22 @@ Pre-compiled binaries provided by Shining Light Productions (https://slproweb.co
### third-party\build\win\cert\signtool
============================================================================ INFO
#### INFO
https://learn.microsoft.com/en-us/windows/win32/seccrypto/signtool
VERSION: Windows SDK 10.0.22621.0
### third-party\common\linux\premake
============================================================================ INFO
#### INFO
https://github.com/premake/premake-core
VERSION: https://github.com/premake/premake-core/releases/tag/v5.0.0-beta2
============================================================================ LICENSE
#### LICENSE
Copyright (c) 2003-2022 Jason Perkins and individual contributors.
All rights reserved.
@ -257,12 +262,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
### third-party\common\win\premake
============================================================================ INFO
#### INFO
https://github.com/premake/premake-core
VERSION: https://github.com/premake/premake-core/releases/tag/v5.0.0-beta2
============================================================================ LICENSE
#### LICENSE
Copyright (c) 2003-2022 Jason Perkins and individual contributors.
All rights reserved.
@ -293,12 +300,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
### third-party\common\win\vswhere
============================================================================ INFO
#### INFO
https://github.com/microsoft/vswhere
VERSION: https://github.com/microsoft/vswhere/releases/tag/3.1.7
============================================================================ LICENSE
#### LICENSE
The MIT License (MIT)
Copyright (C) Microsoft Corporation. All rights reserved.
@ -310,12 +319,14 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
### third-party\deps\common\curl
============================================================================ INFO
#### INFO
https://github.com/curl/curl
VERSION: https://github.com/curl/curl/releases/tag/curl-8_9_1
============================================================================ LICENSE
#### LICENSE
COPYRIGHT AND PERMISSION NOTICE
Copyright (c) 1996 - 2024, Daniel Stenberg, <daniel@haxx.se>, and many
@ -341,12 +352,14 @@ in this Software without prior written authorization of the copyright holder.
### third-party\deps\common\ingame_overlay
============================================================================ INFO
#### INFO
https://github.com/Nemirtingas/ingame_overlay
VERSION: https://github.com/Nemirtingas/ingame_overlay/tree/16260d812154d6f8a4ecdbaf78449c0b7d2fd098
============================================================================ LICENSE
#### LICENSE
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
@ -1024,12 +1037,14 @@ Public License instead of this License. But first, please read
### third-party\deps\common\libssq
============================================================================ INFO
#### INFO
https://github.com/BinaryAlien/libssq
VERSION: https://github.com/BinaryAlien/libssq/releases/tag/v3.0.0
============================================================================ LICENSE
#### LICENSE
MIT License
Copyright (c) 2023 BinaryAlien
@ -1053,12 +1068,14 @@ SOFTWARE.
### third-party\deps\common\mbedtls
============================================================================ INFO
#### INFO
https://github.com/Mbed-TLS/mbedtls
VERSION: https://github.com/Mbed-TLS/mbedtls/releases/tag/v3.6.0
============================================================================ LICENSE
#### LICENSE
Mbed TLS files are provided under a dual [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html)
OR [GPL-2.0-or-later](https://spdx.org/licenses/GPL-2.0-or-later.html) license.
This means that users may choose which of these licenses they take the code
@ -1543,14 +1560,14 @@ PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
@ -1615,12 +1632,14 @@ Public License instead of this License.
### third-party\deps\common\protobuf
============================================================================ INFO
#### INFO
https://github.com/protocolbuffers/protobuf
VERSION: https://github.com/protocolbuffers/protobuf/releases/tag/v27.3
============================================================================ LICENSE
#### LICENSE
Copyright 2008 Google Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -1656,12 +1675,14 @@ support library is itself covered by the above license.
### third-party\deps\common\zlib
============================================================================ INFO
#### INFO
https://github.com/madler/zlib
VERSION: https://github.com/madler/zlib/releases/tag/v1.3.1
============================================================================ LICENSE
#### LICENSE
MIT License
Copyright (c) 2023 BinaryAlien
@ -1685,12 +1706,14 @@ SOFTWARE.
### third-party\deps\linux\7za
============================================================================ INFO
#### INFO
https://sourceforge.net/projects/p7zip/
VERSION: https://sourceforge.net/projects/p7zip/files/p7zip/16.02/
============================================================================ LICENSE
#### LICENSE
7-Zip
~~~~~
License for use and distribution
@ -1784,12 +1807,14 @@ VERSION: https://sourceforge.net/projects/p7zip/files/p7zip/16.02/
### third-party\deps\linux\cmake
============================================================================ INFO
#### INFO
https://gitlab.kitware.com/cmake/cmake
VERSION: https://github.com/Kitware/CMake/releases/tag/v3.30.2
============================================================================ LICENSE
#### LICENSE
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
@ -1958,12 +1983,14 @@ Library.
### third-party\deps\win\7za
============================================================================ INFO
#### INFO
https://www.7-zip.org/
VERSION: https://sourceforge.net/projects/sevenzip/files/7-Zip/24.08/
============================================================================ LICENSE
#### LICENSE
7-Zip
~~~~~
License for use and distribution
@ -2057,12 +2084,14 @@ VERSION: https://sourceforge.net/projects/sevenzip/files/7-Zip/24.08/
### third-party\deps\win\cmake
============================================================================ INFO
#### INFO
https://gitlab.kitware.com/cmake/cmake
VERSION: https://github.com/Kitware/CMake/releases/tag/v3.30.2
============================================================================ LICENSE
#### LICENSE
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
@ -2231,12 +2260,14 @@ Library.
### libs\detours
============================================================================ INFO
#### INFO
https://github.com/microsoft/Detours
VERSION: https://github.com/microsoft/Detours/tree/4b8c659f549b0ab21cf649377c7a84eb708f5e68
============================================================================ LICENSE
#### LICENSE
Copyright (c) Microsoft Corporation.
MIT License
@ -2261,12 +2292,14 @@ SOFTWARE.
### libs\fifo_map
============================================================================ INFO
#### INFO
https://github.com/nlohmann/fifo_map
VERSION: https://github.com/nlohmann/fifo_map/tree/d732aaf9a315415ae8fd7eb11e3a4c1f80e42a48
============================================================================ LICENSE
#### LICENSE
MIT License
Copyright (c) 2015-2017 Niels Lohmann
@ -2291,12 +2324,14 @@ SOFTWARE.
### libs\gamepad
============================================================================ INFO
#### INFO
https://github.com/mtwilliams/libgamepad
VERSION: ????
============================================================================ LICENSE
#### LICENSE
Copyright (c) 2014 Michael Williams
Copyright (c) 2010-2011 Sean Middleditch
@ -2320,12 +2355,14 @@ THE SOFTWARE.
### libs\imgui
============================================================================ INFO
#### INFO
https://github.com/ocornut/imgui
VERSION: ????
============================================================================ LICENSE
#### LICENSE
The MIT License (MIT)
Copyright (c) 2014-2024 Omar Cornut
@ -2350,12 +2387,14 @@ SOFTWARE.
### libs\json
============================================================================ INFO
#### INFO
https://github.com/nlohmann/json
VERSION: https://github.com/nlohmann/json/releases/tag/v3.11.3
============================================================================ LICENSE
#### LICENSE
MIT License
Copyright (c) 2013-2022 Niels Lohmann
@ -2380,22 +2419,24 @@ SOFTWARE.
### libs\sha
============================================================================ INFO
#### INFO
https://github.com/vog/sha1
VERSION: https://github.com/vog/sha1/tree/3f8a4aa032d144309d00dbfe972906a49b3631b9
============================================================================ LICENSE
#### LICENSE
PUBLIC DOMAIN
### libs\simpleini
============================================================================ INFO
#### INFO
https://github.com/brofield/simpleini
VERSION: https://github.com/brofield/simpleini/releases/tag/v4.22
============================================================================ LICENSE
#### LICENSE
The MIT License (MIT)
Copyright (c) 2006-2022 Brodie Thiesfield
@ -2419,12 +2460,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
### libs\stb
============================================================================ INFO
#### INFO
https://github.com/nothings/stb
VERSION: https://github.com/nothings/stb/tree/f75e8d1cad7d90d72ef7a4661f1b994ef78b4e31
============================================================================ LICENSE
#### LICENSE
This software is available under 2 licenses -- choose whichever you prefer.
------------------------------------------------------------------------------
ALTERNATIVE A - MIT License
@ -2465,12 +2508,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
### libs\utfcpp
============================================================================ INFO
#### INFO
https://github.com/nemtrif/utfcpp
VERSION: https://github.com/nemtrif/utfcpp/releases/tag/v4.0.5
============================================================================ LICENSE
#### LICENSE
Boost Software License - Version 1.0 - August 17th, 2003
Permission is hereby granted, free of charge, to any person or organization
@ -2497,7 +2542,8 @@ DEALINGS IN THE SOFTWARE.
### tools\steamclient_loader
============================================================================ INFO
#### INFO
https://github.com/Rat431/ColdAPI_Steam
Original version of ColdClientLoader by Rat431.

View File

@ -40,7 +40,7 @@ set /a "BUILD_DEPS=0"
if %BUILD_DEPS% equ 1 (
set "CMAKE_GENERATOR=Visual Studio 17 2022"
call "%PREMAKE_EXE%" --file="premake5-deps.lua" --64-build --32-build --all-ext --all-build --j=2 --verbose --clean --os=windows vs2022
if %errorlevel% neq 0 (
if !errorlevel! neq 0 (
goto :end_script_with_err
)
goto :end_script
@ -89,7 +89,7 @@ set /a "BUILD_DEPS=0"
set "BUILD_TARGET=%%C"
echo. & echo: building !BUILD_TARGET! !BUILD_TYPE! !BUILD_PLATFORM!
call "%MSBUILD_EXE%" /nologo -m:%MAX_THREADS% -v:n /p:Configuration=!BUILD_TYPE!,Platform=!BUILD_PLATFORM! /target:!BUILD_TARGET! "%SLN_FILE%"
if %errorlevel% neq 0 (
if !errorlevel! neq 0 (
goto :end_script_with_err
)
)

View File

@ -14,7 +14,7 @@ set "FILTER=SOURCE.txt"
echo:# Many thanks for these sources>> "%CREDITS_FILE%"
for %%A in (%GLOB%) do (
powershell -Command "Get-ChildItem -LiteralPath \"%%~A\" -Filter \"%FILTER%\" -File -Recurse | foreach { $parent = Split-Path -Path $_.FullName -Parent; $relative = (Resolve-Path -Path $parent -Relative).replace(\".\\\",\"\"); Write-Output \"- ^[$^($relative^)^]^(#$^($relative^)^)\"; }">> "%CREDITS_FILE%"
powershell -Command "Get-ChildItem -LiteralPath \"%%~A\" -Filter \"%FILTER%\" -File -Recurse | foreach { $parent = Split-Path -Path $_.FullName -Parent; $relative = (Resolve-Path -Path $parent -Relative).replace(\".\\\",\"\"); $relative_tag = $relative.replace(\"\\\", \"\"); Write-Output \"- ^[$^($relative^)^]^(#$^($relative_tag^)^)\"; }">> "%CREDITS_FILE%"
)
echo.>> "%CREDITS_FILE%"

View File

@ -1,9 +1,11 @@
============================================================================ INFO
#### INFO
https://github.com/microsoft/Detours
VERSION: https://github.com/microsoft/Detours/tree/4b8c659f549b0ab21cf649377c7a84eb708f5e68
============================================================================ LICENSE
#### LICENSE
Copyright (c) Microsoft Corporation.
MIT License

View File

@ -1,9 +1,11 @@
============================================================================ INFO
#### INFO
https://github.com/nlohmann/fifo_map
VERSION: https://github.com/nlohmann/fifo_map/tree/d732aaf9a315415ae8fd7eb11e3a4c1f80e42a48
============================================================================ LICENSE
#### LICENSE
MIT License
Copyright (c) 2015-2017 Niels Lohmann

View File

@ -1,9 +1,11 @@
============================================================================ INFO
#### INFO
https://github.com/mtwilliams/libgamepad
VERSION: ????
============================================================================ LICENSE
#### LICENSE
Copyright (c) 2014 Michael Williams
Copyright (c) 2010-2011 Sean Middleditch

View File

@ -1,9 +1,11 @@
============================================================================ INFO
#### INFO
https://github.com/ocornut/imgui
VERSION: ????
============================================================================ LICENSE
#### LICENSE
The MIT License (MIT)
Copyright (c) 2014-2024 Omar Cornut

View File

@ -1,9 +1,11 @@
============================================================================ INFO
#### INFO
https://github.com/nlohmann/json
VERSION: https://github.com/nlohmann/json/releases/tag/v3.11.3
============================================================================ LICENSE
#### LICENSE
MIT License
Copyright (c) 2013-2022 Niels Lohmann

View File

@ -1,7 +1,7 @@
============================================================================ INFO
#### INFO
https://github.com/vog/sha1
VERSION: https://github.com/vog/sha1/tree/3f8a4aa032d144309d00dbfe972906a49b3631b9
============================================================================ LICENSE
#### LICENSE
PUBLIC DOMAIN

View File

@ -1,9 +1,11 @@
============================================================================ INFO
#### INFO
https://github.com/brofield/simpleini
VERSION: https://github.com/brofield/simpleini/releases/tag/v4.22
============================================================================ LICENSE
#### LICENSE
The MIT License (MIT)
Copyright (c) 2006-2022 Brodie Thiesfield

View File

@ -1,9 +1,11 @@
============================================================================ INFO
#### INFO
https://github.com/nothings/stb
VERSION: https://github.com/nothings/stb/tree/f75e8d1cad7d90d72ef7a4661f1b994ef78b4e31
============================================================================ LICENSE
#### LICENSE
This software is available under 2 licenses -- choose whichever you prefer.
------------------------------------------------------------------------------
ALTERNATIVE A - MIT License

View File

@ -1,9 +1,11 @@
============================================================================ INFO
#### INFO
https://github.com/nemtrif/utfcpp
VERSION: https://github.com/nemtrif/utfcpp/releases/tag/v4.0.5
============================================================================ LICENSE
#### LICENSE
Boost Software License - Version 1.0 - August 17th, 2003
Permission is hereby granted, free of charge, to any person or organization

@ -1 +1 @@
Subproject commit 89d0bbf43221dc758efa56f988cb0f0a34b84342
Subproject commit c8c5f528a1a90e7ba786990aa5176a389aae0ec9

@ -1 +1 @@
Subproject commit b4194b9019386d456031a9a0fd6b63a867ab0108
Subproject commit 22820de027d406ebe325d44aa8586c748fcb4d04

@ -1 +1 @@
Subproject commit a70c58d93377d1a472d9320842183bc533d87e5d
Subproject commit b175df78fb75c6df7cbead5aab546ebcdc233a55

@ -1 +1 @@
Subproject commit 22197753b2a01b5097610f4c62f6c9f7eb1e27d2
Subproject commit d5c831a49d04294261927a73a955809914031407

@ -1 +1 @@
Subproject commit be07085cc615800304acf619fcc9f4b6107c0574
Subproject commit c802ad748daaef68177e95ae3ee2d37d9f1bcc95

@ -1 +1 @@
Subproject commit 3171da4672b2f10a06edfed6e54e5999872f1b22
Subproject commit 8a0f4f7b52b0d989ee9812a1d221f06939aa6330

View File

@ -1,4 +1,5 @@
============================================================================ INFO
#### INFO
https://github.com/Rat431/ColdAPI_Steam
Original version of ColdClientLoader by Rat431.