From 4f378d243c81c3c9656ab9365fc60c2451cd6b2b Mon Sep 17 00:00:00 2001 From: Qais Patankar Date: Sat, 14 Sep 2019 18:54:45 -0400 Subject: [PATCH 1/5] Share version.h --- Client/core/CCore.cpp | 4 +- Client/loader/MainFunctions.cpp | 2 +- Client/version.h | 91 --------------------------------- {Server => Shared}/version.h | 34 ++++++++---- 4 files changed, 28 insertions(+), 103 deletions(-) delete mode 100644 Client/version.h rename {Server => Shared}/version.h (82%) diff --git a/Client/core/CCore.cpp b/Client/core/CCore.cpp index 5cf54f2242e..aaad85f52f7 100644 --- a/Client/core/CCore.cpp +++ b/Client/core/CCore.cpp @@ -960,7 +960,7 @@ void CCore::CreateNetwork() ulong ulNetModuleVersion = 0; pfnCheckCompatibility(1, &ulNetModuleVersion); SString strMessage("Network module not compatible! (Expected 0x%x, got 0x%x)", MTA_DM_CLIENT_NET_MODULE_VERSION, ulNetModuleVersion); -#if !defined(MTA_DM_CONNECT_TO_PUBLIC) +#if !defined(MTA_DM_PUBLIC_CONNECTIONS) strMessage += "\n\n(Devs: Update source and run win-install-data.bat)"; #endif BrowseToSolution("netc-not-compatible", ASK_GO_ONLINE | TERMINATE_PROCESS, strMessage); @@ -1314,7 +1314,7 @@ void CCore::RegisterCommands() m_pCommands->Add("showframegraph", _("shows the frame timing graph"), CCommandFuncs::ShowFrameGraph); m_pCommands->Add("jinglebells", "", CCommandFuncs::JingleBells); m_pCommands->Add("fakelag", "", CCommandFuncs::FakeLag); - + m_pCommands->Add("reloadnews", "for developers: reload news", CCommandFuncs::ReloadNews); } diff --git a/Client/loader/MainFunctions.cpp b/Client/loader/MainFunctions.cpp index 202ee6b86cd..f7f668ce1ef 100644 --- a/Client/loader/MainFunctions.cpp +++ b/Client/loader/MainFunctions.cpp @@ -825,7 +825,7 @@ void CheckDataFiles() if (!VerifyEmbeddedSignature(PathJoin(strMTASAPath, MTA_EXE_NAME))) { SString strMessage(_("Main file is unsigned. Possible virus activity.\n\nSee online help if MTA does not work correctly.")); - #if MTASA_VERSION_BUILD > 0 && defined(MTA_DM_CONNECT_TO_PUBLIC) && !defined(MTA_DEBUG) + #if MTASA_VERSION_BUILD > 0 && defined(MTA_DM_PUBLIC_CONNECTIONS) && !defined(MTA_DEBUG) DisplayErrorMessageBox(strMessage, _E("CL29"), "maybe-virus1"); #endif } diff --git a/Client/version.h b/Client/version.h deleted file mode 100644 index 3139cefb2ec..00000000000 --- a/Client/version.h +++ /dev/null @@ -1,91 +0,0 @@ -// -// MTA10/version.h -// -// Client version file -// - -// -// To compile a client: -// 1. set MTASA_VERSION_TYPE to VERSION_TYPE_CUSTOM -// 2. Use netc.dll from the latest unstable build (nightly.mtasa.com) -// - -// New version info -#define MTASA_VERSION_MAJOR 1 -#define MTASA_VERSION_MINOR 5 -#define MTASA_VERSION_MAINTENANCE 7 -#define MTASA_VERSION_TYPE VERSION_TYPE_CUSTOM -#define MTASA_VERSION_BUILD 0 - -#include "build_overrides_c.h" - -// Old version info -#define MTA_DM_VERSION ( ( ( MTASA_VERSION_MAJOR ) << 8 ) | ( ( MTASA_VERSION_MINOR ) << 4 ) | ( ( MTASA_VERSION_MAINTENANCE ) << 0 ) ) -#if MTASA_VERSION_MAINTENANCE == 0 - #define MTA_DM_VERSIONSTRING QUOTE_DEFINE ( MTASA_VERSION_MAJOR ) "." QUOTE_DEFINE ( MTASA_VERSION_MINOR ) -#else - #define MTA_DM_VERSIONSTRING QUOTE_DEFINE ( MTASA_VERSION_MAJOR ) "." QUOTE_DEFINE ( MTASA_VERSION_MINOR ) "." QUOTE_DEFINE ( MTASA_VERSION_MAINTENANCE ) -#endif -#define MTA_DM_FULL_STRING "MTA:SA Client" - -// Compile types -#define VERSION_TYPE_CUSTOM 0x01 -#define VERSION_TYPE_EXPERIMENTAL 0x03 -#define VERSION_TYPE_UNSTABLE 0x05 -#define VERSION_TYPE_UNTESTED 0x07 -#define VERSION_TYPE_RELEASE 0x09 - -#define QUOTE_DEFINE2(c) #c -#define QUOTE_DEFINE(x) QUOTE_DEFINE2(x) - -// Implement compile types -#if MTASA_VERSION_TYPE == VERSION_TYPE_CUSTOM - - #define MTA_DM_BUILDTYPE "custom" - #define MTA_DM_BUILDTAG_SHORT MTA_DM_VERSIONSTRING "-" MTA_DM_BUILDTYPE - #define MTA_DM_BUILDTAG_LONG MTA_DM_VERSIONSTRING "-" MTA_DM_BUILDTYPE - -#elif MTASA_VERSION_TYPE == VERSION_TYPE_UNSTABLE - - #define MTA_DM_BUILDTYPE "unstable" - #define MTA_DM_BUILDTAG_SHORT MTA_DM_VERSIONSTRING "-" MTA_DM_BUILDTYPE "-" QUOTE_DEFINE ( MTASA_VERSION_BUILD ) - #define MTA_DM_BUILDTAG_LONG MTA_DM_VERSIONSTRING "-" MTA_DM_BUILDTYPE "-" QUOTE_DEFINE ( MTASA_VERSION_BUILD ) - -#elif MTASA_VERSION_TYPE == VERSION_TYPE_UNTESTED - - #define MTA_DM_BUILDTYPE "untested" - #define MTA_DM_BUILDTAG_SHORT MTA_DM_VERSIONSTRING "-" MTA_DM_BUILDTYPE "-" QUOTE_DEFINE ( MTASA_VERSION_BUILD ) - #define MTA_DM_BUILDTAG_LONG MTA_DM_VERSIONSTRING "-" MTA_DM_BUILDTYPE "-" QUOTE_DEFINE ( MTASA_VERSION_BUILD ) - #define MTA_DM_CONNECT_TO_PUBLIC - #define MTA_DM_EXPIRE_DAYS 60 - -#elif MTASA_VERSION_TYPE == VERSION_TYPE_RELEASE - - #define MTA_DM_BUILDTYPE "release" - #define MTA_DM_BUILDTAG_SHORT MTA_DM_VERSIONSTRING - #define MTA_DM_BUILDTAG_LONG MTA_DM_VERSIONSTRING "-" MTA_DM_BUILDTYPE "-" QUOTE_DEFINE ( MTASA_VERSION_BUILD ) - #define MTA_DM_CONNECT_TO_PUBLIC - -#else - #error "Incorrect MTASA_VERSION_TYPE" -#endif - -#define _ASE_VERSION QUOTE_DEFINE(MTASA_VERSION_MAJOR) "." QUOTE_DEFINE(MTASA_VERSION_MINOR) -#define _NETCODE_VERSION_BRANCH_ID 0x4 // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk) -#define _CLIENT_NET_MODULE_VERSION 0x0AB // (0x000 - 0xfff) Lvl9 wizards only -#define _NETCODE_VERSION 0x1DA // (0x000 - 0xfff) Increment when net messages change (pre-release) -#define MTA_DM_BITSTREAM_VERSION 0x06C // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code). - -// To avoid user confusion, make sure the ASE version matches only if communication is possible -#if defined(MTA_DM_CONNECT_TO_PUBLIC) - #define MTA_DM_ASE_VERSION _ASE_VERSION - #define MTA_DM_NETCODE_VERSION _NETCODE_VERSION - #define MTA_DM_CLIENT_NET_MODULE_VERSION _CLIENT_NET_MODULE_VERSION -#else - #if _NETCODE_VERSION_BRANCH_ID < 1 || _NETCODE_VERSION_BRANCH_ID > 15 - #error "_NETCODE_VERSION_BRANCH_ID wrong" - #endif - #define MTA_DM_ASE_VERSION _ASE_VERSION "n" - #define MTA_DM_NETCODE_VERSION ( _NETCODE_VERSION + ( _NETCODE_VERSION_BRANCH_ID << 12 ) ) - #define MTA_DM_CLIENT_NET_MODULE_VERSION ( _CLIENT_NET_MODULE_VERSION + ( 4 << 12 ) ) -#endif diff --git a/Server/version.h b/Shared/version.h similarity index 82% rename from Server/version.h rename to Shared/version.h index 93237a546bc..00db2227ac5 100644 --- a/Server/version.h +++ b/Shared/version.h @@ -1,10 +1,13 @@ // -// MTA10_Server/version.h -// -// Server version file +// Shared/version.h // #pragma once +// +// To compile a client: +// 1. set MTASA_VERSION_TYPE to VERSION_TYPE_CUSTOM +// 2. Use netc.dll from the latest unstable build (nightly.mtasa.com) +// // // To compile a public server: // 1. set MTASA_VERSION_TYPE to VERSION_TYPE_RELEASE @@ -21,7 +24,11 @@ #define MTASA_VERSION_TYPE VERSION_TYPE_CUSTOM #define MTASA_VERSION_BUILD 0 +#ifdef MTA_CLIENT +#include "build_overrides_c.h" +#else #include "build_overrides_s.h" +#endif // Old version info #define MTA_DM_VERSION ( ( ( MTASA_VERSION_MAJOR ) << 8 ) | ( ( MTASA_VERSION_MINOR ) << 4 ) | ( ( MTASA_VERSION_MAINTENANCE ) << 0 ) ) @@ -30,7 +37,12 @@ #else #define MTA_DM_VERSIONSTRING QUOTE_DEFINE ( MTASA_VERSION_MAJOR ) "." QUOTE_DEFINE ( MTASA_VERSION_MINOR ) "." QUOTE_DEFINE ( MTASA_VERSION_MAINTENANCE ) #endif -#define MTA_DM_FULL_STRING "MTA:SA Server" + +#ifdef MTA_CLIENT +#define MTA_DM_FULL_STRING "MTA:SA Client" +#else +#define MTA_DM_FULL_STRING "MTA:SA Server" +#endif // Compile types #define VERSION_TYPE_CUSTOM 0x01 @@ -60,14 +72,15 @@ #define MTA_DM_BUILDTYPE "untested" #define MTA_DM_BUILDTAG_SHORT MTA_DM_VERSIONSTRING "-" MTA_DM_BUILDTYPE "-" QUOTE_DEFINE ( MTASA_VERSION_BUILD ) #define MTA_DM_BUILDTAG_LONG MTA_DM_VERSIONSTRING "-" MTA_DM_BUILDTYPE "-" QUOTE_DEFINE ( MTASA_VERSION_BUILD ) - #define MTA_DM_CONNECT_FROM_PUBLIC + #define MTA_DM_PUBLIC_CONNECTIONS + #define MTA_DM_EXPIRE_DAYS 60 #elif MTASA_VERSION_TYPE == VERSION_TYPE_RELEASE #define MTA_DM_BUILDTYPE "release" #define MTA_DM_BUILDTAG_SHORT MTA_DM_VERSIONSTRING #define MTA_DM_BUILDTAG_LONG MTA_DM_VERSIONSTRING "-" MTA_DM_BUILDTYPE "-" QUOTE_DEFINE ( MTASA_VERSION_BUILD ) - #define MTA_DM_CONNECT_FROM_PUBLIC + #define MTA_DM_PUBLIC_CONNECTIONS #else #error "Incorrect MTASA_VERSION_TYPE" @@ -75,14 +88,16 @@ #define _ASE_VERSION QUOTE_DEFINE(MTASA_VERSION_MAJOR) "." QUOTE_DEFINE(MTASA_VERSION_MINOR) #define _NETCODE_VERSION_BRANCH_ID 0x4 // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk) +#define _CLIENT_NET_MODULE_VERSION 0x0AB // (0x000 - 0xfff) Lvl9 wizards only #define _SERVER_NET_MODULE_VERSION 0x0AB // (0x000 - 0xfff) Lvl9 wizards only #define _NETCODE_VERSION 0x1DA // (0x000 - 0xfff) Increment when net messages change (pre-release) #define MTA_DM_BITSTREAM_VERSION 0x06C // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code). // To avoid user confusion, make sure the ASE version matches only if communication is possible -#if defined(MTA_DM_CONNECT_FROM_PUBLIC) +#if defined(MTA_DM_PUBLIC_CONNECTIONS) #define MTA_DM_ASE_VERSION _ASE_VERSION #define MTA_DM_NETCODE_VERSION _NETCODE_VERSION + #define MTA_DM_CLIENT_NET_MODULE_VERSION _CLIENT_NET_MODULE_VERSION #define MTA_DM_SERVER_NET_MODULE_VERSION _SERVER_NET_MODULE_VERSION #else #if _NETCODE_VERSION_BRANCH_ID < 1 || _NETCODE_VERSION_BRANCH_ID > 15 @@ -90,12 +105,13 @@ #endif #define MTA_DM_ASE_VERSION _ASE_VERSION "n" #define MTA_DM_NETCODE_VERSION ( _NETCODE_VERSION + ( _NETCODE_VERSION_BRANCH_ID << 12 ) ) + #define MTA_DM_CLIENT_NET_MODULE_VERSION ( _CLIENT_NET_MODULE_VERSION + ( 4 << 12 ) ) #define MTA_DM_SERVER_NET_MODULE_VERSION _SERVER_NET_MODULE_VERSION #endif // Handy self compile message -#ifndef MTA_DM_CONNECT_FROM_PUBLIC - #if defined(SHOW_SELF_COMPILE_WARNING) && !defined(CI_BUILD) +#ifndef MTA_DM_PUBLIC_CONNECTIONS + #if defined(SHOW_SELF_COMPILE_WARNING) && !defined(CI_BUILD) && !defined(MTA_CLIENT) #pragma message("\n\ ----------------------------------------------------------------------\n\ MTASA_VERSION_TYPE is not set to VERSION_TYPE_RELEASE\n\ From 2832c9107c81072c052aaf007c0fd96d09165a90 Mon Sep 17 00:00:00 2001 From: Qais Patankar Date: Sat, 14 Sep 2019 19:25:11 -0400 Subject: [PATCH 2/5] Fix build? --- Client/cefweb/StdInc.h | 2 +- Client/core/CCore.h | 2 +- Client/game_sa/StdInc.h | 2 +- Client/mods/deathmatch/StdInc.h | 2 +- Client/mods/deathmatch/premake5.lua | 1 - Client/multiplayer_sa/StdInc.h | 2 +- Server/core/StdInc.h | 2 +- Server/mods/deathmatch/StdInc.h | 2 +- Server/mods/deathmatch/premake5.lua | 1 - Shared/XML/StdInc.h | 2 +- Shared/sdk/SharedUtil.Misc.hpp | 4 ++-- Shared/{ => sdk}/version.h | 4 ++-- 12 files changed, 12 insertions(+), 14 deletions(-) rename Shared/{ => sdk}/version.h (96%) diff --git a/Client/cefweb/StdInc.h b/Client/cefweb/StdInc.h index 5438985043a..a73dad4cf8a 100644 --- a/Client/cefweb/StdInc.h +++ b/Client/cefweb/StdInc.h @@ -16,7 +16,7 @@ #include #include #include -#include "../version.h" +#include "version.h" #include "CWebCore.h" #include "CWebView.h" diff --git a/Client/core/CCore.h b/Client/core/CCore.h index 8d2faa91f6f..0186290a97b 100644 --- a/Client/core/CCore.h +++ b/Client/core/CCore.h @@ -13,7 +13,7 @@ class CCore; #pragma once -#include "../version.h" +#include "version.h" #include "CClientVariables.h" #include "CCommands.h" diff --git a/Client/game_sa/StdInc.h b/Client/game_sa/StdInc.h index 33ba8b5ac99..bf93d1a75f9 100644 --- a/Client/game_sa/StdInc.h +++ b/Client/game_sa/StdInc.h @@ -24,7 +24,7 @@ #include #include #include -#include <../version.h> +#include #include // Game includes diff --git a/Client/mods/deathmatch/StdInc.h b/Client/mods/deathmatch/StdInc.h index 75cb77d42b1..ad7fbe27f6b 100644 --- a/Client/mods/deathmatch/StdInc.h +++ b/Client/mods/deathmatch/StdInc.h @@ -158,4 +158,4 @@ #include "logic/CResource.h" #include "logic/CStaticFunctionDefinitions.h" #include "logic/CResourceFileDownloadManager.h" -#include "../../version.h" +#include "version.h" diff --git a/Client/mods/deathmatch/premake5.lua b/Client/mods/deathmatch/premake5.lua index 70c1dd0c27b..0ab88b1396e 100644 --- a/Client/mods/deathmatch/premake5.lua +++ b/Client/mods/deathmatch/premake5.lua @@ -53,7 +53,6 @@ project "Client Deathmatch" "../../../Shared/mods/deathmatch/logic/**.h", "../../../Shared/animation/CEasingCurve.cpp", "../../../Shared/animation/CPositionRotationAnimation.cpp", - "../../version.h", -- Todo: Replace these two by using the CryptoPP functions instead "../../../vendor/bochs/bochs_internal/crc32.cpp" } diff --git a/Client/multiplayer_sa/StdInc.h b/Client/multiplayer_sa/StdInc.h index 136698c9a1a..75dc663a947 100644 --- a/Client/multiplayer_sa/StdInc.h +++ b/Client/multiplayer_sa/StdInc.h @@ -23,7 +23,7 @@ #include #include #include -#include <../version.h> +#include #include // Multiplayer includes diff --git a/Server/core/StdInc.h b/Server/core/StdInc.h index 050304b9c0c..ef259fe29ed 100644 --- a/Server/core/StdInc.h +++ b/Server/core/StdInc.h @@ -17,7 +17,7 @@ #define WITH_ALLOC_TRACKING 0 #endif #include "SharedUtil.h" -#include "../version.h" +#include "version.h" #ifdef WIN32 #include "CExceptionInformation_Impl.h" diff --git a/Server/mods/deathmatch/StdInc.h b/Server/mods/deathmatch/StdInc.h index 0b0fe6f5eb8..b9753cacb21 100644 --- a/Server/mods/deathmatch/StdInc.h +++ b/Server/mods/deathmatch/StdInc.h @@ -303,7 +303,7 @@ struct SAclRequest; #include "CServer.h" #include "Config.h" #define SHOW_SELF_COMPILE_WARNING -#include "../../version.h" +#include "version.h" extern CNetServer* g_pRealNetServer; extern CGame* g_pGame; diff --git a/Server/mods/deathmatch/premake5.lua b/Server/mods/deathmatch/premake5.lua index 1ec897c1616..05c9c4e0dc5 100644 --- a/Server/mods/deathmatch/premake5.lua +++ b/Server/mods/deathmatch/premake5.lua @@ -49,7 +49,6 @@ project "Deathmatch" "../../../Shared/mods/deathmatch/logic/**.h", "../../../Shared/animation/CEasingCurve.cpp", "../../../Shared/animation/CPositionRotationAnimation.cpp", - "../../version.h", -- Todo: Replace these two by using the CryptoPP functions instead "../../../vendor/bochs/bochs_internal/crc32.cpp", } diff --git a/Shared/XML/StdInc.h b/Shared/XML/StdInc.h index 78e184f581d..36f4848f8b1 100644 --- a/Shared/XML/StdInc.h +++ b/Shared/XML/StdInc.h @@ -24,7 +24,7 @@ #include "CXMLNodeImpl.h" #include "CXMLImpl.h" #include "CXMLArray.h" -#include "../../Server/version.h" +#include "version.h" // XML includes #include diff --git a/Shared/sdk/SharedUtil.Misc.hpp b/Shared/sdk/SharedUtil.Misc.hpp index f0c83f37db9..eaf43357e44 100644 --- a/Shared/sdk/SharedUtil.Misc.hpp +++ b/Shared/sdk/SharedUtil.Misc.hpp @@ -56,7 +56,7 @@ CDuplicateLineFilter ms_ReportLineFilter; #define TROUBLE_URL1 "http://updatesa.multitheftauto.com/sa/trouble/?v=_VERSION_&id=_ID_&tr=_TROUBLE_" #ifndef MTA_DM_ASE_VERSION - #include <../../Client/version.h> + #include #endif // @@ -1248,7 +1248,7 @@ DWORD SharedUtil::GetMainThreadId() // Get the module information for the currently running process DWORD processEntryPointAddress = 0; MODULEINFO moduleInfo = {}; - + if (GetModuleInformation(GetCurrentProcess(), GetModuleHandle(nullptr), &moduleInfo, sizeof(MODULEINFO)) != 0) { processEntryPointAddress = reinterpret_cast(moduleInfo.EntryPoint); diff --git a/Shared/version.h b/Shared/sdk/version.h similarity index 96% rename from Shared/version.h rename to Shared/sdk/version.h index 00db2227ac5..7503e6d1650 100644 --- a/Shared/version.h +++ b/Shared/sdk/version.h @@ -25,9 +25,9 @@ #define MTASA_VERSION_BUILD 0 #ifdef MTA_CLIENT -#include "build_overrides_c.h" +#include "../../Client/build_overrides_c.h" #else -#include "build_overrides_s.h" +#include "../../Server/build_overrides_s.h" #endif // Old version info From 4992e0c00a18be4a6d31da9b0d4f0a7d72cfb659 Mon Sep 17 00:00:00 2001 From: Qais Patankar Date: Sun, 15 Sep 2019 13:25:10 -0400 Subject: [PATCH 3/5] maybe fix windows build --- Client/loader/StdInc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/loader/StdInc.h b/Client/loader/StdInc.h index c5d007dd418..036cada8821 100644 --- a/Client/loader/StdInc.h +++ b/Client/loader/StdInc.h @@ -25,7 +25,7 @@ extern CLocalizationInterface* g_pLocalization; #include "Install.h" #include "Utils.h" #include "Dialogs.h" -#include "..\version.h" +#include "version.h" #include "CInstallManager.h" #include "D3DStuff.h" #include "CExePatchedStatus.h" From a29af0de74230a7a3b95dce4d4d81d5f2e2b7fd3 Mon Sep 17 00:00:00 2001 From: patrikjuvonen <22572159+patrikjuvonen@users.noreply.github.com> Date: Tue, 29 Dec 2020 22:29:20 +0200 Subject: [PATCH 4/5] Move build_overrides.h under Shared --- Server/build_overrides_s.h | 0 Server/core/CDynamicLibrary.cpp | 2 +- Client/build_overrides_c.h => Shared/build_overrides.h | 0 Shared/sdk/version.h | 6 +----- 4 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 Server/build_overrides_s.h rename Client/build_overrides_c.h => Shared/build_overrides.h (100%) diff --git a/Server/build_overrides_s.h b/Server/build_overrides_s.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Server/core/CDynamicLibrary.cpp b/Server/core/CDynamicLibrary.cpp index d8ae3d3c193..3f73524e263 100644 --- a/Server/core/CDynamicLibrary.cpp +++ b/Server/core/CDynamicLibrary.cpp @@ -145,7 +145,7 @@ FuncPtr_t CDynamicLibrary::GetProcedureAddress(const char* szProcName) bool CDynamicLibrary::CheckMtaVersion(const char* szLibName) { #if MTASA_VERSION_TYPE >= VERSION_TYPE_UNSTABLE -// define MTASA_SKIP_VERSION_CHECKS in "build_overrides_s.h" to skip version checks +// define MTASA_SKIP_VERSION_CHECKS in "Shared/build_overrides.h" to skip version checks #ifndef MTASA_SKIP_VERSION_CHECKS if (m_hModule == 0) diff --git a/Client/build_overrides_c.h b/Shared/build_overrides.h similarity index 100% rename from Client/build_overrides_c.h rename to Shared/build_overrides.h diff --git a/Shared/sdk/version.h b/Shared/sdk/version.h index cd0a262ca30..54415692c7b 100644 --- a/Shared/sdk/version.h +++ b/Shared/sdk/version.h @@ -24,11 +24,7 @@ #define MTASA_VERSION_TYPE VERSION_TYPE_CUSTOM #define MTASA_VERSION_BUILD 0 -#ifdef MTA_CLIENT -#include "../../Client/build_overrides_c.h" -#else -#include "../../Server/build_overrides_s.h" -#endif +#include "../../Shared/build_overrides.h" // Old version info #define MTA_DM_VERSION ( ( ( MTASA_VERSION_MAJOR ) << 8 ) | ( ( MTASA_VERSION_MINOR ) << 4 ) | ( ( MTASA_VERSION_MAINTENANCE ) << 0 ) ) From 88942ffbca0391b5194e2007438148d5e7ce518a Mon Sep 17 00:00:00 2001 From: patrikjuvonen <22572159+patrikjuvonen@users.noreply.github.com> Date: Tue, 29 Dec 2020 22:31:05 +0200 Subject: [PATCH 5/5] Tweak build_overrides path --- Shared/sdk/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shared/sdk/version.h b/Shared/sdk/version.h index 54415692c7b..6acffe8b749 100644 --- a/Shared/sdk/version.h +++ b/Shared/sdk/version.h @@ -24,7 +24,7 @@ #define MTASA_VERSION_TYPE VERSION_TYPE_CUSTOM #define MTASA_VERSION_BUILD 0 -#include "../../Shared/build_overrides.h" +#include "../build_overrides.h" // Old version info #define MTA_DM_VERSION ( ( ( MTASA_VERSION_MAJOR ) << 8 ) | ( ( MTASA_VERSION_MINOR ) << 4 ) | ( ( MTASA_VERSION_MAINTENANCE ) << 0 ) )