Skip to content

Commit

Permalink
Merge pull request #21 from Sak32009/dev
Browse files Browse the repository at this point in the history
fixed anchor tag in CREDITS.md + fixed %errorlevel% on build_win_premake.bat + updated commit submodules
  • Loading branch information
Detanup01 authored Aug 19, 2024
2 parents a8bebdd + d440a0a commit f8c18b5
Show file tree
Hide file tree
Showing 19 changed files with 2,525 additions and 2,462 deletions.
4,914 changes: 2,480 additions & 2,434 deletions CREDITS.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build_win_premake.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
)
Expand Down
2 changes: 1 addition & 1 deletion generate_credits.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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%"
Expand Down
6 changes: 4 additions & 2 deletions libs/detours/SOURCE.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 4 additions & 2 deletions libs/fifo_map/SOURCE.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 4 additions & 2 deletions libs/gamepad/SOURCE.txt
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 4 additions & 2 deletions libs/imgui/SOURCE.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
============================================================================ INFO
#### INFO

https://github.com/ocornut/imgui

VERSION: ????

============================================================================ LICENSE
#### LICENSE

The MIT License (MIT)

Copyright (c) 2014-2024 Omar Cornut
Expand Down
6 changes: 4 additions & 2 deletions libs/json/SOURCE.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions libs/sha/source.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
============================================================================ INFO
#### INFO
https://github.com/vog/sha1

VERSION: https://github.com/vog/sha1/tree/3f8a4aa032d144309d00dbfe972906a49b3631b9

============================================================================ LICENSE
#### LICENSE
PUBLIC DOMAIN
6 changes: 4 additions & 2 deletions libs/simpleini/SOURCE.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 4 additions & 2 deletions libs/stb/SOURCE.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 4 additions & 2 deletions libs/utfcpp/SOURCE.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion third-party/build/win
Submodule win updated from 89d0bb to c8c5f5
2 changes: 1 addition & 1 deletion third-party/common/linux
Submodule linux updated from b4194b to 22820d
2 changes: 1 addition & 1 deletion third-party/common/win
Submodule win updated from a70c58 to b175df
2 changes: 1 addition & 1 deletion third-party/deps/common
Submodule common updated from 221977 to d5c831
2 changes: 1 addition & 1 deletion third-party/deps/linux
Submodule linux updated from be0708 to c802ad
2 changes: 1 addition & 1 deletion third-party/deps/win
Submodule win updated from 3171da to 8a0f4f
3 changes: 2 additions & 1 deletion tools/steamclient_loader/SOURCE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
============================================================================ INFO
#### INFO

https://github.com/Rat431/ColdAPI_Steam

Original version of ColdClientLoader by Rat431.

0 comments on commit f8c18b5

Please sign in to comment.