small stuff

This commit is contained in:
Skull 2025-03-17 04:02:19 +03:00
parent d6fd7b430c
commit a5e1b0a636
9 changed files with 18 additions and 26 deletions

View File

@ -251,9 +251,9 @@ warnings "Extra"
characterset "ASCII" characterset "ASCII"
if _OPTIONS["dev-build"] then if _OPTIONS["dev-build"] then
defines {"DEV_BUILD", 'BUILD_NAME="IW7_DEV"'} defines {"DEV_BUILD", 'BUILD_NAME="S2_DEV"'}
else else
defines {'BUILD_NAME="IW7"'} defines {'BUILD_NAME="S2"'}
end end
if _OPTIONS["steam-overlay"] then if _OPTIONS["steam-overlay"] then
@ -320,17 +320,11 @@ links {"common"}
prebuildcommands {"pushd %{_MAIN_SCRIPT_DIR}", "tools\\premake5 generate-buildinfo", "popd"} prebuildcommands {"pushd %{_MAIN_SCRIPT_DIR}", "tools\\premake5 generate-buildinfo", "popd"}
local COMPUTER_NAME = os.getenv('COMPUTERNAME') local COMPUTER_NAME = os.getenv('COMPUTERNAME')
if COMPUTER_NAME == "JOEL-PC" then if COMPUTER_NAME == "PC" then
debugdir "D:\\Games\\PC\\IW7" debugdir "D:\\Games\\Call of Duty WWII"
debugcommand "D:\\Games\\PC\\IW7\\$(TargetName)$(TargetExt)" debugcommand "D:\\Games\\Call of Duty WWII\\$(TargetName)$(TargetExt)"
postbuildcommands { postbuildcommands {
"copy /y \"$(OutDir)$(TargetName)$(TargetExt)\" \"D:\\Games\\PC\\IW7\\$(TargetName)$(TargetExt)\"", "copy /y \"$(OutDir)$(TargetName)$(TargetExt)\" \"D:\\Games\\Call of Duty WWII\\$(TargetName)$(TargetExt)\"",
}
elseif COMPUTER_NAME == "DESKTOP-P7PCR6I" or COMPUTER_NAME == "mikey" then
debugdir "C:\\Program Files (x86)\\Steam\\steamapps\\common\\Call of Duty - Infinite Warfare"
debugcommand "C:\\Program Files (x86)\\Steam\\steamapps\\common\\Call of Duty - Infinite Warfare\\$(TargetName)$(TargetExt)"
postbuildcommands {
"copy /y \"$(OutDir)$(TargetName)$(TargetExt)\" \"C:\\Program Files (x86)\\Steam\\steamapps\\common\\Call of Duty - Infinite Warfare\\$(TargetName)$(TargetExt)\"",
} }
end end

View File

@ -1 +1 @@
// #include <std_include.hpp>

View File

@ -2,8 +2,6 @@
#include "game.hpp" #include "game.hpp"
#include "dvars.hpp" #include "dvars.hpp"
#include "component/console/console.hpp"
#include <utils/flags.hpp> #include <utils/flags.hpp>
#include <utils/string.hpp> #include <utils/string.hpp>
#include <utils/io.hpp> #include <utils/io.hpp>

View File

@ -8,7 +8,7 @@ namespace tls
{ {
namespace namespace
{ {
utils::binary_resource tls_dll_file(TLS_DLL, "iw7-tlsdll.dll"); utils::binary_resource tls_dll_file(TLS_DLL, "s2-tlsdll.dll");
} }
PIMAGE_TLS_DIRECTORY allocate_tls_index() PIMAGE_TLS_DIRECTORY allocate_tls_index()

View File

@ -70,15 +70,15 @@ BEGIN
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "XLabs" VALUE "CompanyName", "Skkuull"
VALUE "FileDescription", "IW7-Mod" VALUE "FileDescription", "S2-Mod"
VALUE "FileVersion", VERSION_FILE VALUE "FileVersion", VERSION_FILE
VALUE "InternalName", "IW7-Mod" VALUE "InternalName", "S2-Mod"
VALUE "LegalCopyright", "Copyright (C) 2022 X Labs Project. All rights reserved." VALUE "LegalCopyright", "Copyright (C) 2022 skkuull. All rights reserved."
VALUE "Licence", "GPLv3" VALUE "Licence", "GPLv3"
VALUE "Info", "https://github.com/Joelrau/iw7-mod/" VALUE "Info", "https://github.com/skkuull/s2-mod/"
VALUE "OriginalFilename", "iw7-mod.exe" VALUE "OriginalFilename", "s2-mod.exe"
VALUE "ProductName", "iw7-mod" VALUE "ProductName", "s2-mod"
VALUE "ProductVersion", VERSION_PRODUCT VALUE "ProductVersion", VERSION_PRODUCT
END END
END END

View File

@ -3,7 +3,6 @@
#include "game/game.hpp" #include "game/game.hpp"
#include "hash.hpp" #include "hash.hpp"
#include "component/console/console.hpp"
#include <zlib.h> #include <zlib.h>
#include <utils/cryptography.hpp> #include <utils/cryptography.hpp>

View File

@ -28,7 +28,7 @@ namespace exception
char pathname[MAX_PATH] = {0}; char pathname[MAX_PATH] = {0};
GetTempPathA(sizeof(pathname), pathname); GetTempPathA(sizeof(pathname), pathname);
GetTempFileNameA(pathname, "IW7-", 0, filename); GetTempFileNameA(pathname, "S2-", 0, filename);
return filename; return filename;
} }

View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <stdexcept>
namespace utils namespace utils
{ {

View File

@ -18,7 +18,7 @@ namespace utils::properties
CoTaskMemFree(path); CoTaskMemFree(path);
}); });
static auto appdata = std::filesystem::path(path) / "auroramod/iw7-mod"; static auto appdata = std::filesystem::path(path) / "s2-mod";
return appdata; return appdata;
} }
} }