From 87c1c3694354ad45549902b46f718a8b6db26cf5 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Tue, 29 Dec 2015 02:52:31 +0100 Subject: [PATCH] Use premake. --- .gitignore | 3 +- iw4.sln | 19 -- iw4/Components/Loader.hpp | 46 --- iw4/iw4.vcxproj | 144 ---------- iw4/iw4.vcxproj.filters | 266 ------------------ iw4/iw4.vcxproj.user | 9 - package.json | 10 - premake5.lua | 13 + {iw4 => src}/Components/Loader.cpp | 0 src/Components/Loader.hpp | 46 +++ .../Components/Modules}/AssetHandler.cpp | 2 +- .../Components/Modules}/AssetHandler.hpp | 0 .../Components/Modules}/Colors.cpp | 2 +- .../Components/Modules}/Colors.hpp | 0 .../Components/Modules}/Command.cpp | 2 +- .../Components/Modules}/Command.hpp | 0 .../Components/Modules}/Console.cpp | 2 +- .../Components/Modules}/Console.hpp | 0 .../Components/Modules}/Dedicated.cpp | 2 +- .../Components/Modules}/Dedicated.hpp | 0 .../Components/Modules}/Dvar.cpp | 2 +- .../Components/Modules}/Dvar.hpp | 0 .../Components/Modules}/FastFiles.cpp | 2 +- .../Components/Modules}/FastFiles.hpp | 0 .../Components/Modules}/FileSystem.cpp | 2 +- .../Components/Modules}/FileSystem.hpp | 0 .../Components/Modules}/Localization.cpp | 2 +- .../Components/Modules}/Localization.hpp | 0 .../Components/Modules}/Logger.cpp | 2 +- .../Components/Modules}/Logger.hpp | 0 .../Components/Modules}/Maps.cpp | 2 +- .../Components/Modules}/Maps.hpp | 0 .../Components/Modules}/Materials.cpp | 2 +- .../Components/Modules}/Materials.hpp | 0 .../Components/Modules}/Menus.cpp | 2 +- .../Components/Modules}/Menus.hpp | 0 .../Components/Modules}/MusicalTalent.cpp | 2 +- .../Components/Modules}/MusicalTalent.hpp | 0 .../Components/Modules}/Network.cpp | 2 +- .../Components/Modules}/Network.hpp | 0 .../Components/Modules}/Party.cpp | 2 +- .../Components/Modules}/Party.hpp | 0 .../Components/Modules}/QuickPatch.cpp | 2 +- .../Components/Modules}/QuickPatch.hpp | 0 .../Components/Modules}/RawFiles.cpp | 2 +- .../Components/Modules}/RawFiles.hpp | 0 .../Components/Modules}/Renderer.cpp | 2 +- .../Components/Modules}/Renderer.hpp | 0 .../Components/Modules}/ServerList.cpp | 2 +- .../Components/Modules}/ServerList.hpp | 0 .../Components/Modules}/Singleton.cpp | 2 +- .../Components/Modules}/Singleton.hpp | 0 .../Components/Modules}/UIFeeder.cpp | 2 +- .../Components/Modules}/UIFeeder.hpp | 0 .../Components/Modules}/UIScript.cpp | 2 +- .../Components/Modules}/UIScript.hpp | 0 .../Components/Modules}/Window.cpp | 2 +- .../Components/Modules}/Window.hpp | 0 {iw4 => src}/Game/Functions.cpp | 0 {iw4 => src}/Game/Functions.hpp | 0 {iw4 => src}/Game/Structs.hpp | 0 {iw4 => src}/Main.cpp | 0 {iw4 => src}/STDInclude.hpp | 0 .../Steam/Interfaces/SteamFriends.cpp | 0 .../Steam/Interfaces/SteamFriends.hpp | 0 .../Steam/Interfaces/SteamGameServer.cpp | 0 .../Steam/Interfaces/SteamGameServer.hpp | 0 .../Interfaces/SteamMasterServerUpdater.cpp | 0 .../Interfaces/SteamMasterServerUpdater.hpp | 0 .../Steam/Interfaces/SteamMatchmaking.cpp | 0 .../Steam/Interfaces/SteamMatchmaking.hpp | 0 .../Steam/Interfaces/SteamNetworking.cpp | 0 .../Steam/Interfaces/SteamNetworking.hpp | 0 .../Steam/Interfaces/SteamRemoteStorage.cpp | 0 .../Steam/Interfaces/SteamRemoteStorage.hpp | 0 {iw4 => src}/Steam/Interfaces/SteamUser.cpp | 0 {iw4 => src}/Steam/Interfaces/SteamUser.hpp | 0 {iw4 => src}/Steam/Interfaces/SteamUtils.cpp | 0 {iw4 => src}/Steam/Interfaces/SteamUtils.hpp | 0 {iw4 => src}/Steam/Steam.cpp | 0 {iw4 => src}/Steam/Steam.hpp | 0 {iw4 => src}/Utils/Hooking.cpp | 0 {iw4 => src}/Utils/Hooking.hpp | 0 {iw4 => src}/Utils/Utils.cpp | 0 {iw4 => src}/Utils/Utils.hpp | 0 85 files changed, 85 insertions(+), 519 deletions(-) delete mode 100644 iw4.sln delete mode 100644 iw4/Components/Loader.hpp delete mode 100644 iw4/iw4.vcxproj delete mode 100644 iw4/iw4.vcxproj.filters delete mode 100644 iw4/iw4.vcxproj.user delete mode 100644 package.json create mode 100644 premake5.lua rename {iw4 => src}/Components/Loader.cpp (100%) create mode 100644 src/Components/Loader.hpp rename {iw4/Components => src/Components/Modules}/AssetHandler.cpp (99%) rename {iw4/Components => src/Components/Modules}/AssetHandler.hpp (100%) rename {iw4/Components => src/Components/Modules}/Colors.cpp (98%) rename {iw4/Components => src/Components/Modules}/Colors.hpp (100%) rename {iw4/Components => src/Components/Modules}/Command.cpp (97%) rename {iw4/Components => src/Components/Modules}/Command.hpp (100%) rename {iw4/Components => src/Components/Modules}/Console.cpp (96%) rename {iw4/Components => src/Components/Modules}/Console.hpp (100%) rename {iw4/Components => src/Components/Modules}/Dedicated.cpp (99%) rename {iw4/Components => src/Components/Modules}/Dedicated.hpp (100%) rename {iw4/Components => src/Components/Modules}/Dvar.cpp (99%) rename {iw4/Components => src/Components/Modules}/Dvar.hpp (100%) rename {iw4/Components => src/Components/Modules}/FastFiles.cpp (98%) rename {iw4/Components => src/Components/Modules}/FastFiles.hpp (100%) rename {iw4/Components => src/Components/Modules}/FileSystem.cpp (92%) rename {iw4/Components => src/Components/Modules}/FileSystem.hpp (100%) rename {iw4/Components => src/Components/Modules}/Localization.cpp (97%) rename {iw4/Components => src/Components/Modules}/Localization.hpp (100%) rename {iw4/Components => src/Components/Modules}/Logger.cpp (96%) rename {iw4/Components => src/Components/Modules}/Logger.hpp (100%) rename {iw4/Components => src/Components/Modules}/Maps.cpp (99%) rename {iw4/Components => src/Components/Modules}/Maps.hpp (100%) rename {iw4/Components => src/Components/Modules}/Materials.cpp (94%) rename {iw4/Components => src/Components/Modules}/Materials.hpp (100%) rename {iw4/Components => src/Components/Modules}/Menus.cpp (99%) rename {iw4/Components => src/Components/Modules}/Menus.hpp (100%) rename {iw4/Components => src/Components/Modules}/MusicalTalent.cpp (97%) rename {iw4/Components => src/Components/Modules}/MusicalTalent.hpp (100%) rename {iw4/Components => src/Components/Modules}/Network.cpp (98%) rename {iw4/Components => src/Components/Modules}/Network.hpp (100%) rename {iw4/Components => src/Components/Modules}/Party.cpp (99%) rename {iw4/Components => src/Components/Modules}/Party.hpp (100%) rename {iw4/Components => src/Components/Modules}/QuickPatch.cpp (98%) rename {iw4/Components => src/Components/Modules}/QuickPatch.hpp (100%) rename {iw4/Components => src/Components/Modules}/RawFiles.cpp (96%) rename {iw4/Components => src/Components/Modules}/RawFiles.hpp (100%) rename {iw4/Components => src/Components/Modules}/Renderer.cpp (95%) rename {iw4/Components => src/Components/Modules}/Renderer.hpp (100%) rename {iw4/Components => src/Components/Modules}/ServerList.cpp (99%) rename {iw4/Components => src/Components/Modules}/ServerList.hpp (100%) rename {iw4/Components => src/Components/Modules}/Singleton.cpp (94%) rename {iw4/Components => src/Components/Modules}/Singleton.hpp (100%) rename {iw4/Components => src/Components/Modules}/UIFeeder.cpp (99%) rename {iw4/Components => src/Components/Modules}/UIFeeder.hpp (100%) rename {iw4/Components => src/Components/Modules}/UIScript.cpp (98%) rename {iw4/Components => src/Components/Modules}/UIScript.hpp (100%) rename {iw4/Components => src/Components/Modules}/Window.cpp (94%) rename {iw4/Components => src/Components/Modules}/Window.hpp (100%) rename {iw4 => src}/Game/Functions.cpp (100%) rename {iw4 => src}/Game/Functions.hpp (100%) rename {iw4 => src}/Game/Structs.hpp (100%) rename {iw4 => src}/Main.cpp (100%) rename {iw4 => src}/STDInclude.hpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamFriends.cpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamFriends.hpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamGameServer.cpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamGameServer.hpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamMasterServerUpdater.cpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamMasterServerUpdater.hpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamMatchmaking.cpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamMatchmaking.hpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamNetworking.cpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamNetworking.hpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamRemoteStorage.cpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamRemoteStorage.hpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamUser.cpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamUser.hpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamUtils.cpp (100%) rename {iw4 => src}/Steam/Interfaces/SteamUtils.hpp (100%) rename {iw4 => src}/Steam/Steam.cpp (100%) rename {iw4 => src}/Steam/Steam.hpp (100%) rename {iw4 => src}/Utils/Hooking.cpp (100%) rename {iw4 => src}/Utils/Hooking.hpp (100%) rename {iw4 => src}/Utils/Utils.cpp (100%) rename {iw4 => src}/Utils/Utils.hpp (100%) diff --git a/.gitignore b/.gitignore index f42aa55f..ac784e20 100644 --- a/.gitignore +++ b/.gitignore @@ -56,7 +56,8 @@ Temporary Items *.suo # Additional stuff -Normal +build +premake5.exe # IDA # ========================= diff --git a/iw4.sln b/iw4.sln deleted file mode 100644 index e9a2632a..00000000 --- a/iw4.sln +++ /dev/null @@ -1,19 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iw4", "iw4\iw4.vcxproj", "{38B4FC13-CEBC-4099-8698-3E62943C1EAA}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Normal|Win32 = Normal|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {38B4FC13-CEBC-4099-8698-3E62943C1EAA}.Normal|Win32.ActiveCfg = Normal|Win32 - {38B4FC13-CEBC-4099-8698-3E62943C1EAA}.Normal|Win32.Build.0 = Normal|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/iw4/Components/Loader.hpp b/iw4/Components/Loader.hpp deleted file mode 100644 index e88131ee..00000000 --- a/iw4/Components/Loader.hpp +++ /dev/null @@ -1,46 +0,0 @@ -namespace Components -{ - class Component - { - public: - Component() {}; - virtual ~Component() {}; - virtual const char* GetName() { return "Unknown"; }; - }; - - class Loader - { - public: - static void Initialize(); - static void Uninitialize(); - static void Register(Component* component); - - private: - static std::vector Components; - }; -} - -#include "Dvar.hpp" -#include "Maps.hpp" -#include "Menus.hpp" -#include "Colors.hpp" -#include "Logger.hpp" -#include "Window.hpp" -#include "Command.hpp" -#include "Console.hpp" -#include "Network.hpp" -#include "Party.hpp" // Destroys the order, but requires network classes :D -#include "RawFiles.hpp" -#include "Renderer.hpp" -#include "UIFeeder.hpp" -#include "UIScript.hpp" -#include "Dedicated.hpp" -#include "FastFiles.hpp" -#include "Materials.hpp" -#include "Singleton.hpp" -#include "FileSystem.hpp" -#include "QuickPatch.hpp" -#include "ServerList.hpp" -#include "AssetHandler.hpp" -#include "Localization.hpp" -#include "MusicalTalent.hpp" diff --git a/iw4/iw4.vcxproj b/iw4/iw4.vcxproj deleted file mode 100644 index 1089b3c3..00000000 --- a/iw4/iw4.vcxproj +++ /dev/null @@ -1,144 +0,0 @@ - - - - - Normal - Win32 - - - - {38B4FC13-CEBC-4099-8698-3E62943C1EAA} - Win32Proj - iw4 - - - - DynamicLibrary - false - v120 - true - MultiByte - - - - - - - - - - false - iw4x - $(SolutionDir)$(Configuration)\Bin\ - $(SolutionDir)$(Configuration)\Obj\ - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;IW4_EXPORTS;%(PreprocessorDefinitions) - true - true - - - Windows - true - true - true - - - copy /y "$(TargetPath)" "D:\Games\SteamLibrary\steamapps\common\Call of Duty Modern Warfare 2\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - \ No newline at end of file diff --git a/iw4/iw4.vcxproj.filters b/iw4/iw4.vcxproj.filters deleted file mode 100644 index 17fde619..00000000 --- a/iw4/iw4.vcxproj.filters +++ /dev/null @@ -1,266 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {c97341f6-b778-4acf-bdce-24c602206b5a} - - - {d46d7650-0188-47ba-865f-c78e5b7e9910} - - - {88e00811-087a-4881-8abf-5e8eb4695a3b} - - - {3e48fe95-8760-4a3d-b4b7-5b9b3025886d} - - - {ff889d4b-f01e-4c7f-9ba8-39ab0326c32b} - - - {42cf4b9a-e10a-4c28-ac06-2bfa9e259784} - - - - - Source - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Utils - - - Source\Utils - - - Source\Components - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Game - - - Source\Steam - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Steam\Interfaces - - - Source\Utils - - - Source\Utils - - - Source\Components - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Game - - - Source\Game - - - Source\Steam - - - Source\Components\Modules - - - Source - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - Source\Components\Modules - - - \ No newline at end of file diff --git a/iw4/iw4.vcxproj.user b/iw4/iw4.vcxproj.user deleted file mode 100644 index a67d02b0..00000000 --- a/iw4/iw4.vcxproj.user +++ /dev/null @@ -1,9 +0,0 @@ - - - - iw4m.exe - D:\Games\SteamLibrary\steamapps\common\Call of Duty Modern Warfare 2\ - WindowsLocalDebugger - +set dedicated 1 - - \ No newline at end of file diff --git a/package.json b/package.json deleted file mode 100644 index fe821ca8..00000000 --- a/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "iw4", - "version": "1.0.0", - "description": "", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "ISC" -} diff --git a/premake5.lua b/premake5.lua new file mode 100644 index 00000000..d7f9bcb7 --- /dev/null +++ b/premake5.lua @@ -0,0 +1,13 @@ +solution "iw4x" + location ("./build") + configurations { "Normal" } + + project "iw4x" + kind "SharedLib" + language "C++" + files { "src/**.hpp", "src/**.cpp" } + toolset "v120" -- Compatibility for users + + configuration "Normal" + defines { "NDEBUG" } + flags { "Optimize", "MultiProcessorCompile", "Symbols" } diff --git a/iw4/Components/Loader.cpp b/src/Components/Loader.cpp similarity index 100% rename from iw4/Components/Loader.cpp rename to src/Components/Loader.cpp diff --git a/src/Components/Loader.hpp b/src/Components/Loader.hpp new file mode 100644 index 00000000..5c73f6c6 --- /dev/null +++ b/src/Components/Loader.hpp @@ -0,0 +1,46 @@ +namespace Components +{ + class Component + { + public: + Component() {}; + virtual ~Component() {}; + virtual const char* GetName() { return "Unknown"; }; + }; + + class Loader + { + public: + static void Initialize(); + static void Uninitialize(); + static void Register(Component* component); + + private: + static std::vector Components; + }; +} + +#include "Modules\Dvar.hpp" +#include "Modules\Maps.hpp" +#include "Modules\Menus.hpp" +#include "Modules\Colors.hpp" +#include "Modules\Logger.hpp" +#include "Modules\Window.hpp" +#include "Modules\Command.hpp" +#include "Modules\Console.hpp" +#include "Modules\Network.hpp" +#include "Modules\Party.hpp" // Destroys the order, but requires network classes :D +#include "Modules\RawFiles.hpp" +#include "Modules\Renderer.hpp" +#include "Modules\UIFeeder.hpp" +#include "Modules\UIScript.hpp" +#include "Modules\Dedicated.hpp" +#include "Modules\FastFiles.hpp" +#include "Modules\Materials.hpp" +#include "Modules\Singleton.hpp" +#include "Modules\FileSystem.hpp" +#include "Modules\QuickPatch.hpp" +#include "Modules\ServerList.hpp" +#include "Modules\AssetHandler.hpp" +#include "Modules\Localization.hpp" +#include "Modules\MusicalTalent.hpp" diff --git a/iw4/Components/AssetHandler.cpp b/src/Components/Modules/AssetHandler.cpp similarity index 99% rename from iw4/Components/AssetHandler.cpp rename to src/Components/Modules/AssetHandler.cpp index 50854bc0..dfb8b88d 100644 --- a/iw4/Components/AssetHandler.cpp +++ b/src/Components/Modules/AssetHandler.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/AssetHandler.hpp b/src/Components/Modules/AssetHandler.hpp similarity index 100% rename from iw4/Components/AssetHandler.hpp rename to src/Components/Modules/AssetHandler.hpp diff --git a/iw4/Components/Colors.cpp b/src/Components/Modules/Colors.cpp similarity index 98% rename from iw4/Components/Colors.cpp rename to src/Components/Modules/Colors.cpp index 4e623297..91ab345f 100644 --- a/iw4/Components/Colors.cpp +++ b/src/Components/Modules/Colors.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Colors.hpp b/src/Components/Modules/Colors.hpp similarity index 100% rename from iw4/Components/Colors.hpp rename to src/Components/Modules/Colors.hpp diff --git a/iw4/Components/Command.cpp b/src/Components/Modules/Command.cpp similarity index 97% rename from iw4/Components/Command.cpp rename to src/Components/Modules/Command.cpp index 74b12b43..ec62f24d 100644 --- a/iw4/Components/Command.cpp +++ b/src/Components/Modules/Command.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Command.hpp b/src/Components/Modules/Command.hpp similarity index 100% rename from iw4/Components/Command.hpp rename to src/Components/Modules/Command.hpp diff --git a/iw4/Components/Console.cpp b/src/Components/Modules/Console.cpp similarity index 96% rename from iw4/Components/Console.cpp rename to src/Components/Modules/Console.cpp index ee91f0ca..896b8ce7 100644 --- a/iw4/Components/Console.cpp +++ b/src/Components/Modules/Console.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Console.hpp b/src/Components/Modules/Console.hpp similarity index 100% rename from iw4/Components/Console.hpp rename to src/Components/Modules/Console.hpp diff --git a/iw4/Components/Dedicated.cpp b/src/Components/Modules/Dedicated.cpp similarity index 99% rename from iw4/Components/Dedicated.cpp rename to src/Components/Modules/Dedicated.cpp index 0fd80f76..9e290272 100644 --- a/iw4/Components/Dedicated.cpp +++ b/src/Components/Modules/Dedicated.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Dedicated.hpp b/src/Components/Modules/Dedicated.hpp similarity index 100% rename from iw4/Components/Dedicated.hpp rename to src/Components/Modules/Dedicated.hpp diff --git a/iw4/Components/Dvar.cpp b/src/Components/Modules/Dvar.cpp similarity index 99% rename from iw4/Components/Dvar.cpp rename to src/Components/Modules/Dvar.cpp index c66adfab..8c76a1ca 100644 --- a/iw4/Components/Dvar.cpp +++ b/src/Components/Modules/Dvar.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Dvar.hpp b/src/Components/Modules/Dvar.hpp similarity index 100% rename from iw4/Components/Dvar.hpp rename to src/Components/Modules/Dvar.hpp diff --git a/iw4/Components/FastFiles.cpp b/src/Components/Modules/FastFiles.cpp similarity index 98% rename from iw4/Components/FastFiles.cpp rename to src/Components/Modules/FastFiles.cpp index 2a1926d1..9944d494 100644 --- a/iw4/Components/FastFiles.cpp +++ b/src/Components/Modules/FastFiles.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/FastFiles.hpp b/src/Components/Modules/FastFiles.hpp similarity index 100% rename from iw4/Components/FastFiles.hpp rename to src/Components/Modules/FastFiles.hpp diff --git a/iw4/Components/FileSystem.cpp b/src/Components/Modules/FileSystem.cpp similarity index 92% rename from iw4/Components/FileSystem.cpp rename to src/Components/Modules/FileSystem.cpp index d061d6fa..a12281d8 100644 --- a/iw4/Components/FileSystem.cpp +++ b/src/Components/Modules/FileSystem.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/FileSystem.hpp b/src/Components/Modules/FileSystem.hpp similarity index 100% rename from iw4/Components/FileSystem.hpp rename to src/Components/Modules/FileSystem.hpp diff --git a/iw4/Components/Localization.cpp b/src/Components/Modules/Localization.cpp similarity index 97% rename from iw4/Components/Localization.cpp rename to src/Components/Modules/Localization.cpp index 36c83a83..c9f1f21f 100644 --- a/iw4/Components/Localization.cpp +++ b/src/Components/Modules/Localization.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Localization.hpp b/src/Components/Modules/Localization.hpp similarity index 100% rename from iw4/Components/Localization.hpp rename to src/Components/Modules/Localization.hpp diff --git a/iw4/Components/Logger.cpp b/src/Components/Modules/Logger.cpp similarity index 96% rename from iw4/Components/Logger.cpp rename to src/Components/Modules/Logger.cpp index 6b2178b2..17a125d8 100644 --- a/iw4/Components/Logger.cpp +++ b/src/Components/Modules/Logger.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Logger.hpp b/src/Components/Modules/Logger.hpp similarity index 100% rename from iw4/Components/Logger.hpp rename to src/Components/Modules/Logger.hpp diff --git a/iw4/Components/Maps.cpp b/src/Components/Modules/Maps.cpp similarity index 99% rename from iw4/Components/Maps.cpp rename to src/Components/Modules/Maps.cpp index d6ff5895..c1c4e580 100644 --- a/iw4/Components/Maps.cpp +++ b/src/Components/Modules/Maps.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Maps.hpp b/src/Components/Modules/Maps.hpp similarity index 100% rename from iw4/Components/Maps.hpp rename to src/Components/Modules/Maps.hpp diff --git a/iw4/Components/Materials.cpp b/src/Components/Modules/Materials.cpp similarity index 94% rename from iw4/Components/Materials.cpp rename to src/Components/Modules/Materials.cpp index 082cef0c..74e4db85 100644 --- a/iw4/Components/Materials.cpp +++ b/src/Components/Modules/Materials.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Materials.hpp b/src/Components/Modules/Materials.hpp similarity index 100% rename from iw4/Components/Materials.hpp rename to src/Components/Modules/Materials.hpp diff --git a/iw4/Components/Menus.cpp b/src/Components/Modules/Menus.cpp similarity index 99% rename from iw4/Components/Menus.cpp rename to src/Components/Modules/Menus.cpp index bb3526a2..52e6e534 100644 --- a/iw4/Components/Menus.cpp +++ b/src/Components/Modules/Menus.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Menus.hpp b/src/Components/Modules/Menus.hpp similarity index 100% rename from iw4/Components/Menus.hpp rename to src/Components/Modules/Menus.hpp diff --git a/iw4/Components/MusicalTalent.cpp b/src/Components/Modules/MusicalTalent.cpp similarity index 97% rename from iw4/Components/MusicalTalent.cpp rename to src/Components/Modules/MusicalTalent.cpp index 7074d5dc..a15c850e 100644 --- a/iw4/Components/MusicalTalent.cpp +++ b/src/Components/Modules/MusicalTalent.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/MusicalTalent.hpp b/src/Components/Modules/MusicalTalent.hpp similarity index 100% rename from iw4/Components/MusicalTalent.hpp rename to src/Components/Modules/MusicalTalent.hpp diff --git a/iw4/Components/Network.cpp b/src/Components/Modules/Network.cpp similarity index 98% rename from iw4/Components/Network.cpp rename to src/Components/Modules/Network.cpp index 3c84849b..01d25a9e 100644 --- a/iw4/Components/Network.cpp +++ b/src/Components/Modules/Network.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Network.hpp b/src/Components/Modules/Network.hpp similarity index 100% rename from iw4/Components/Network.hpp rename to src/Components/Modules/Network.hpp diff --git a/iw4/Components/Party.cpp b/src/Components/Modules/Party.cpp similarity index 99% rename from iw4/Components/Party.cpp rename to src/Components/Modules/Party.cpp index 1e61e7da..e1808a51 100644 --- a/iw4/Components/Party.cpp +++ b/src/Components/Modules/Party.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Party.hpp b/src/Components/Modules/Party.hpp similarity index 100% rename from iw4/Components/Party.hpp rename to src/Components/Modules/Party.hpp diff --git a/iw4/Components/QuickPatch.cpp b/src/Components/Modules/QuickPatch.cpp similarity index 98% rename from iw4/Components/QuickPatch.cpp rename to src/Components/Modules/QuickPatch.cpp index 522f1d60..c055cce4 100644 --- a/iw4/Components/QuickPatch.cpp +++ b/src/Components/Modules/QuickPatch.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/QuickPatch.hpp b/src/Components/Modules/QuickPatch.hpp similarity index 100% rename from iw4/Components/QuickPatch.hpp rename to src/Components/Modules/QuickPatch.hpp diff --git a/iw4/Components/RawFiles.cpp b/src/Components/Modules/RawFiles.cpp similarity index 96% rename from iw4/Components/RawFiles.cpp rename to src/Components/Modules/RawFiles.cpp index 4c816e29..a2af44df 100644 --- a/iw4/Components/RawFiles.cpp +++ b/src/Components/Modules/RawFiles.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/RawFiles.hpp b/src/Components/Modules/RawFiles.hpp similarity index 100% rename from iw4/Components/RawFiles.hpp rename to src/Components/Modules/RawFiles.hpp diff --git a/iw4/Components/Renderer.cpp b/src/Components/Modules/Renderer.cpp similarity index 95% rename from iw4/Components/Renderer.cpp rename to src/Components/Modules/Renderer.cpp index 7ab7167f..a5c73699 100644 --- a/iw4/Components/Renderer.cpp +++ b/src/Components/Modules/Renderer.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Renderer.hpp b/src/Components/Modules/Renderer.hpp similarity index 100% rename from iw4/Components/Renderer.hpp rename to src/Components/Modules/Renderer.hpp diff --git a/iw4/Components/ServerList.cpp b/src/Components/Modules/ServerList.cpp similarity index 99% rename from iw4/Components/ServerList.cpp rename to src/Components/Modules/ServerList.cpp index ec8a2377..37b7be09 100644 --- a/iw4/Components/ServerList.cpp +++ b/src/Components/Modules/ServerList.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/ServerList.hpp b/src/Components/Modules/ServerList.hpp similarity index 100% rename from iw4/Components/ServerList.hpp rename to src/Components/Modules/ServerList.hpp diff --git a/iw4/Components/Singleton.cpp b/src/Components/Modules/Singleton.cpp similarity index 94% rename from iw4/Components/Singleton.cpp rename to src/Components/Modules/Singleton.cpp index 984670ca..e852eca7 100644 --- a/iw4/Components/Singleton.cpp +++ b/src/Components/Modules/Singleton.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Singleton.hpp b/src/Components/Modules/Singleton.hpp similarity index 100% rename from iw4/Components/Singleton.hpp rename to src/Components/Modules/Singleton.hpp diff --git a/iw4/Components/UIFeeder.cpp b/src/Components/Modules/UIFeeder.cpp similarity index 99% rename from iw4/Components/UIFeeder.cpp rename to src/Components/Modules/UIFeeder.cpp index 3f4bfb02..a13fb04f 100644 --- a/iw4/Components/UIFeeder.cpp +++ b/src/Components/Modules/UIFeeder.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/UIFeeder.hpp b/src/Components/Modules/UIFeeder.hpp similarity index 100% rename from iw4/Components/UIFeeder.hpp rename to src/Components/Modules/UIFeeder.hpp diff --git a/iw4/Components/UIScript.cpp b/src/Components/Modules/UIScript.cpp similarity index 98% rename from iw4/Components/UIScript.cpp rename to src/Components/Modules/UIScript.cpp index 11bfb9bc..44de86c3 100644 --- a/iw4/Components/UIScript.cpp +++ b/src/Components/Modules/UIScript.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/UIScript.hpp b/src/Components/Modules/UIScript.hpp similarity index 100% rename from iw4/Components/UIScript.hpp rename to src/Components/Modules/UIScript.hpp diff --git a/iw4/Components/Window.cpp b/src/Components/Modules/Window.cpp similarity index 94% rename from iw4/Components/Window.cpp rename to src/Components/Modules/Window.cpp index 26332fa9..c50fc2fd 100644 --- a/iw4/Components/Window.cpp +++ b/src/Components/Modules/Window.cpp @@ -1,4 +1,4 @@ -#include "..\STDInclude.hpp" +#include "..\..\STDInclude.hpp" namespace Components { diff --git a/iw4/Components/Window.hpp b/src/Components/Modules/Window.hpp similarity index 100% rename from iw4/Components/Window.hpp rename to src/Components/Modules/Window.hpp diff --git a/iw4/Game/Functions.cpp b/src/Game/Functions.cpp similarity index 100% rename from iw4/Game/Functions.cpp rename to src/Game/Functions.cpp diff --git a/iw4/Game/Functions.hpp b/src/Game/Functions.hpp similarity index 100% rename from iw4/Game/Functions.hpp rename to src/Game/Functions.hpp diff --git a/iw4/Game/Structs.hpp b/src/Game/Structs.hpp similarity index 100% rename from iw4/Game/Structs.hpp rename to src/Game/Structs.hpp diff --git a/iw4/Main.cpp b/src/Main.cpp similarity index 100% rename from iw4/Main.cpp rename to src/Main.cpp diff --git a/iw4/STDInclude.hpp b/src/STDInclude.hpp similarity index 100% rename from iw4/STDInclude.hpp rename to src/STDInclude.hpp diff --git a/iw4/Steam/Interfaces/SteamFriends.cpp b/src/Steam/Interfaces/SteamFriends.cpp similarity index 100% rename from iw4/Steam/Interfaces/SteamFriends.cpp rename to src/Steam/Interfaces/SteamFriends.cpp diff --git a/iw4/Steam/Interfaces/SteamFriends.hpp b/src/Steam/Interfaces/SteamFriends.hpp similarity index 100% rename from iw4/Steam/Interfaces/SteamFriends.hpp rename to src/Steam/Interfaces/SteamFriends.hpp diff --git a/iw4/Steam/Interfaces/SteamGameServer.cpp b/src/Steam/Interfaces/SteamGameServer.cpp similarity index 100% rename from iw4/Steam/Interfaces/SteamGameServer.cpp rename to src/Steam/Interfaces/SteamGameServer.cpp diff --git a/iw4/Steam/Interfaces/SteamGameServer.hpp b/src/Steam/Interfaces/SteamGameServer.hpp similarity index 100% rename from iw4/Steam/Interfaces/SteamGameServer.hpp rename to src/Steam/Interfaces/SteamGameServer.hpp diff --git a/iw4/Steam/Interfaces/SteamMasterServerUpdater.cpp b/src/Steam/Interfaces/SteamMasterServerUpdater.cpp similarity index 100% rename from iw4/Steam/Interfaces/SteamMasterServerUpdater.cpp rename to src/Steam/Interfaces/SteamMasterServerUpdater.cpp diff --git a/iw4/Steam/Interfaces/SteamMasterServerUpdater.hpp b/src/Steam/Interfaces/SteamMasterServerUpdater.hpp similarity index 100% rename from iw4/Steam/Interfaces/SteamMasterServerUpdater.hpp rename to src/Steam/Interfaces/SteamMasterServerUpdater.hpp diff --git a/iw4/Steam/Interfaces/SteamMatchmaking.cpp b/src/Steam/Interfaces/SteamMatchmaking.cpp similarity index 100% rename from iw4/Steam/Interfaces/SteamMatchmaking.cpp rename to src/Steam/Interfaces/SteamMatchmaking.cpp diff --git a/iw4/Steam/Interfaces/SteamMatchmaking.hpp b/src/Steam/Interfaces/SteamMatchmaking.hpp similarity index 100% rename from iw4/Steam/Interfaces/SteamMatchmaking.hpp rename to src/Steam/Interfaces/SteamMatchmaking.hpp diff --git a/iw4/Steam/Interfaces/SteamNetworking.cpp b/src/Steam/Interfaces/SteamNetworking.cpp similarity index 100% rename from iw4/Steam/Interfaces/SteamNetworking.cpp rename to src/Steam/Interfaces/SteamNetworking.cpp diff --git a/iw4/Steam/Interfaces/SteamNetworking.hpp b/src/Steam/Interfaces/SteamNetworking.hpp similarity index 100% rename from iw4/Steam/Interfaces/SteamNetworking.hpp rename to src/Steam/Interfaces/SteamNetworking.hpp diff --git a/iw4/Steam/Interfaces/SteamRemoteStorage.cpp b/src/Steam/Interfaces/SteamRemoteStorage.cpp similarity index 100% rename from iw4/Steam/Interfaces/SteamRemoteStorage.cpp rename to src/Steam/Interfaces/SteamRemoteStorage.cpp diff --git a/iw4/Steam/Interfaces/SteamRemoteStorage.hpp b/src/Steam/Interfaces/SteamRemoteStorage.hpp similarity index 100% rename from iw4/Steam/Interfaces/SteamRemoteStorage.hpp rename to src/Steam/Interfaces/SteamRemoteStorage.hpp diff --git a/iw4/Steam/Interfaces/SteamUser.cpp b/src/Steam/Interfaces/SteamUser.cpp similarity index 100% rename from iw4/Steam/Interfaces/SteamUser.cpp rename to src/Steam/Interfaces/SteamUser.cpp diff --git a/iw4/Steam/Interfaces/SteamUser.hpp b/src/Steam/Interfaces/SteamUser.hpp similarity index 100% rename from iw4/Steam/Interfaces/SteamUser.hpp rename to src/Steam/Interfaces/SteamUser.hpp diff --git a/iw4/Steam/Interfaces/SteamUtils.cpp b/src/Steam/Interfaces/SteamUtils.cpp similarity index 100% rename from iw4/Steam/Interfaces/SteamUtils.cpp rename to src/Steam/Interfaces/SteamUtils.cpp diff --git a/iw4/Steam/Interfaces/SteamUtils.hpp b/src/Steam/Interfaces/SteamUtils.hpp similarity index 100% rename from iw4/Steam/Interfaces/SteamUtils.hpp rename to src/Steam/Interfaces/SteamUtils.hpp diff --git a/iw4/Steam/Steam.cpp b/src/Steam/Steam.cpp similarity index 100% rename from iw4/Steam/Steam.cpp rename to src/Steam/Steam.cpp diff --git a/iw4/Steam/Steam.hpp b/src/Steam/Steam.hpp similarity index 100% rename from iw4/Steam/Steam.hpp rename to src/Steam/Steam.hpp diff --git a/iw4/Utils/Hooking.cpp b/src/Utils/Hooking.cpp similarity index 100% rename from iw4/Utils/Hooking.cpp rename to src/Utils/Hooking.cpp diff --git a/iw4/Utils/Hooking.hpp b/src/Utils/Hooking.hpp similarity index 100% rename from iw4/Utils/Hooking.hpp rename to src/Utils/Hooking.hpp diff --git a/iw4/Utils/Utils.cpp b/src/Utils/Utils.cpp similarity index 100% rename from iw4/Utils/Utils.cpp rename to src/Utils/Utils.cpp diff --git a/iw4/Utils/Utils.hpp b/src/Utils/Utils.hpp similarity index 100% rename from iw4/Utils/Utils.hpp rename to src/Utils/Utils.hpp